Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

logseq: fix build, move to by-name #321236

Merged
merged 1 commit into from
Jun 20, 2024
Merged

logseq: fix build, move to by-name #321236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkgs/applications/misc/logseq/default.nix → pkgs/by-name/lo/logseq/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
, fetchurl
, appimageTools
, makeWrapper
# graphs will not sync without matching upstream's major electron version
, electron_27
# Notice: graphs will not sync without matching upstream's major electron version
# the specific electron version is set at top-level file to preserve override interface.
# whenever updating this package also sync electron version at top-level file.
, electron
, autoPatchelfHook
, git
, nix-update-script
Expand Down Expand Up @@ -59,7 +61,7 @@ in {

postFixup = ''
# set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
makeWrapper ${electron_27}/bin/electron $out/bin/${pname} \
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--set "LOCAL_GIT_DIRECTORY" ${git} \
--add-flags $out/share/${pname}/resources/app \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
Expand Down
7 changes: 5 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3060,8 +3060,6 @@ with pkgs;

lilo = callPackage ../tools/misc/lilo { };

logseq = callPackage ../applications/misc/logseq { };

natls = callPackage ../tools/misc/natls { };

notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { };
Expand Down Expand Up @@ -5696,6 +5694,11 @@ with pkgs;

loccount = callPackage ../development/tools/misc/loccount { };

logseq = callPackage ../by-name/lo/logseq/package.nix {
# electron version from: https://github.com/logseq/logseq/blob/d8c6ca264bdf9a6a0f03c46dbf3509210367624a/package.json#L116
electron = electron_28;
};

long-shebang = callPackage ../misc/long-shebang { };

lssecret = callPackage ../misc/lssecret {};
Expand Down