Merge pull request #266866 from emilylange/unbreak-sharedown

sharedown: unbreak build

authored by

Peder Bergebakken Sundt and committed by
GitHub
dbf126c7 7859adb9

+2 -12
+2 -12
pkgs/tools/misc/sharedown/default.nix
··· 6 , libsecret 7 , python3 8 , pkg-config 9 - , nodejs 10 , electron 11 , makeWrapper 12 , makeDesktopItem ··· 63 nativeBuildInputs = [ 64 python3 65 pkg-config 66 ]; 67 buildInputs = [ 68 libsecret ··· 74 ''; 75 }; 76 }; 77 - 78 - preBuild = '' 79 - # Set up headers for node-gyp, which is needed to build keytar. 80 - mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}" 81 - 82 - # 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>. 83 - echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion" 84 - 85 - # Link node headers so that node-gyp does not try to download them. 86 - ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}" 87 - ''; 88 89 packageJSON = "${src}/package.json"; 90 yarnLock = ./yarn.lock;
··· 6 , libsecret 7 , python3 8 , pkg-config 9 + , nodePackages 10 , electron 11 , makeWrapper 12 , makeDesktopItem ··· 63 nativeBuildInputs = [ 64 python3 65 pkg-config 66 + nodePackages.node-gyp 67 ]; 68 buildInputs = [ 69 libsecret ··· 75 ''; 76 }; 77 }; 78 79 packageJSON = "${src}/package.json"; 80 yarnLock = ./yarn.lock;