Skip to content

Commit

Permalink
logseq: fix build, move to by-name
Browse files Browse the repository at this point in the history
  • Loading branch information
superherointj committed Jun 20, 2024
1 parent e73ed3f commit 8b7d6f8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
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
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

This comment has been minimized.

Copy link
@RobFisher

RobFisher Jun 28, 2024

I'm not sure this is the right commit to use because the commit tagged 0.10.9 uses Electron 27.

This comment has been minimized.

Copy link
@superherointj

This comment has been minimized.

Copy link
@superherointj

superherointj Jun 28, 2024

Author Contributor

Fix at: #323130

electron = electron_28;
};

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

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

0 comments on commit 8b7d6f8

Please sign in to comment.