b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #245586 from hall/logseq-electron-24

Browse source 
logseq: match upstream electron version
This commit is contained in:
Weijia Wang 2023-08-01 22:22:58 +02:00 committed by GitHub
parent 927401d3c9 8764644b3e
commit 1039b65783
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/misc/logseq/default.nix
View file

@ -3,7 +3,8 @@
, fetchurl , fetchurl
, appimageTools , appimageTools
, makeWrapper , makeWrapper
, electron # graphs will not sync without matching upstream's major electron version
, electron_24
, git , git
, nix-update-script , nix-update-script
}: }:
@ -56,7 +57,7 @@ in {
postFixup = '' postFixup = ''
# set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs
makeWrapper ${electron}/bin/electron $out/bin/${pname} \ makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \
--set "LOCAL_GIT_DIRECTORY" ${git} \ --set "LOCAL_GIT_DIRECTORY" ${git} \
--add-flags $out/share/${pname}/resources/app \ --add-flags $out/share/${pname}/resources/app \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \