Merge pull request #245586 from hall/logseq-electron-24
logseq: match upstream electron version
This commit is contained in:
commit
1039b65783
|
@ -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}}" \
|
||||||
|
|
Loading…
Reference in a new issue