diff options
| author | Emily <git@emilylange.de> | 2024-02-16 14:09:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-16 14:09:38 +0100 |
| commit | 610303fd14aabf41573f64807ecc09619c2aa1e1 (patch) | |
| tree | bc8945450ae0c8d9bcbe8bd1d00e65a71cede3b8 /pkgs/tools/misc | |
| parent | 12c18b200fa9a2be1923300f72438c719c23beb2 (diff) | |
| parent | bc47f473bea509c5d55497763acd50a8de51c993 (diff) | |
| download | nixlib-610303fd14aabf41573f64807ecc09619c2aa1e1.tar nixlib-610303fd14aabf41573f64807ecc09619c2aa1e1.tar.gz nixlib-610303fd14aabf41573f64807ecc09619c2aa1e1.tar.bz2 nixlib-610303fd14aabf41573f64807ecc09619c2aa1e1.tar.lz nixlib-610303fd14aabf41573f64807ecc09619c2aa1e1.tar.xz nixlib-610303fd14aabf41573f64807ecc09619c2aa1e1.tar.zst nixlib-610303fd14aabf41573f64807ecc09619c2aa1e1.zip | |
Merge pull request #288928 from emilylange/unbreak-packages-that-depend-on-chromium
sharedown: unbreak build, sitespeed-io: unbreak build, add `passthru.updateScript`, 27.3.1 -> 33.0.0
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/sharedown/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 5d1d31b35ac1..c3e87328c1fb 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -6,7 +6,7 @@ , libsecret , python3 , pkg-config -, nodePackages +, nodejs , electron , makeWrapper , makeDesktopItem @@ -63,7 +63,6 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config - nodePackages.node-gyp ]; buildInputs = [ libsecret @@ -76,6 +75,15 @@ stdenvNoCC.mkDerivation rec { }; }; + # needed for node-gyp, copied from https://nixos.org/manual/nixpkgs/unstable/#javascript-yarn2nix-pitfalls + # permalink: https://github.com/NixOS/nixpkgs/blob/d176767c02cb2a048e766215078c3d231e666091/doc/languages-frameworks/javascript.section.md#pitfalls-javascript-yarn2nix-pitfalls + preBuild = '' + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + ''; + packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; |