diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-11-11 20:45:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 20:45:51 +0200 |
| commit | dbf126c73ccc9c2d2d2c081f2ade25a19f4f82dc (patch) | |
| tree | 69e4e325441e43f74c39e702c74cbde2244a4057 | |
| parent | 7859adb9d6cf0cd45011148d673660c976c1ee70 (diff) | |
| parent | c271196d42a99c038472994b0fd0bfd9028b4423 (diff) | |
| download | nixlib-dbf126c73ccc9c2d2d2c081f2ade25a19f4f82dc.tar nixlib-dbf126c73ccc9c2d2d2c081f2ade25a19f4f82dc.tar.gz nixlib-dbf126c73ccc9c2d2d2c081f2ade25a19f4f82dc.tar.bz2 nixlib-dbf126c73ccc9c2d2d2c081f2ade25a19f4f82dc.tar.lz nixlib-dbf126c73ccc9c2d2d2c081f2ade25a19f4f82dc.tar.xz nixlib-dbf126c73ccc9c2d2d2c081f2ade25a19f4f82dc.tar.zst nixlib-dbf126c73ccc9c2d2d2c081f2ade25a19f4f82dc.zip | |
Merge pull request #266866 from emilylange/unbreak-sharedown
sharedown: unbreak build
| -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; |