diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-06-20 10:53:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-20 10:53:16 -0300 |
| commit | 0abe6cae0cb7f63c2e966b1a3784d3935b539986 (patch) | |
| tree | 5811659a8b14be007656a41376a0322b4d31cf3d /pkgs | |
| parent | cb5a0285b06f959149f25b4adad81c4f01c34ead (diff) | |
| parent | 8b7d6f8b0a09f7db74cbce56cf6f1b4bad58d93a (diff) | |
Merge pull request #321236 from superherointj/logseq-fix-build
logseq: fix build, move to by-name
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/lo/logseq/package.nix (renamed from pkgs/applications/misc/logseq/default.nix) | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/by-name/lo/logseq/package.nix index 7dfee5ca9dfdd..793e305ac3a45 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -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}}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53a15471f3499..02fa9524ebba5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; |