mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge pull request #266866 from emilylange/unbreak-sharedown
sharedown: unbreak build
This commit is contained in:
commit
dbf126c73c
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user