diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 00:02:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-12 00:02:14 +0000 |
commit | 33248a2cafb255edb4c91a290864194242622de3 (patch) | |
tree | 13114ade9e94e05d17dc1c77935efa08dab925d2 /pkgs/tools/misc/sharedown/default.nix | |
parent | 9776723357705dedeb933221c8f9b295d44813d7 (diff) | |
parent | 647a6f42eef18d2e8367f1870dfa718640b8a63a (diff) | |
download | nixlib-33248a2cafb255edb4c91a290864194242622de3.tar nixlib-33248a2cafb255edb4c91a290864194242622de3.tar.gz nixlib-33248a2cafb255edb4c91a290864194242622de3.tar.bz2 nixlib-33248a2cafb255edb4c91a290864194242622de3.tar.lz nixlib-33248a2cafb255edb4c91a290864194242622de3.tar.xz nixlib-33248a2cafb255edb4c91a290864194242622de3.tar.zst nixlib-33248a2cafb255edb4c91a290864194242622de3.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc/sharedown/default.nix')
-rw-r--r-- | pkgs/tools/misc/sharedown/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 47e97fa25520..0f93551965e2 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -6,7 +6,7 @@ , libsecret , python3 , pkg-config -, nodejs +, nodePackages , electron , makeWrapper , makeDesktopItem @@ -63,6 +63,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config + nodePackages.node-gyp ]; buildInputs = [ libsecret @@ -75,17 +76,6 @@ stdenvNoCC.mkDerivation rec { }; }; - preBuild = '' - # Set up headers for node-gyp, which is needed to build keytar. - mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}" - - # Set up version which node-gyp checks in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/lib/install.js#L87-L96> against the version in <https://github.com/nodejs/node-gyp/blob/4937722cf597ccd1953628f3d5e2ab5204280051/package.json#L15>. - echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion" - - # Link node headers so that node-gyp does not try to download them. - ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}" - ''; - packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; |