logseq: fix build, move to by-name

This commit is contained in:
superherointj 2024-06-20 08:24:45 -03:00
parent e73ed3f6df
commit 8b7d6f8b0a
2 changed files with 10 additions and 5 deletions

View File

@ -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
@ -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}}"

View File

@ -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 { };
@ -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 {};