diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-06-01 13:59:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 13:59:33 +0200 |
| commit | f0ba8235153dd2e25cf06cbf70d43efdd4443592 (patch) | |
| tree | 1c020052e981faf395a67b61bffdd5bb3e91ad5d | |
| parent | Merge pull request #235356 from NixOS/backport-235348-to-release-23.05 (diff) | |
| parent | openvscode-server: revert #232887 (diff) | |
| download | nixpkgs-f0ba8235153dd2e25cf06cbf70d43efdd4443592.tar.gz | |
Merge pull request #235379 from NixOS/backport-235145-to-release-23.05
[Backport release-23.05] openvscode-server: revert #232887 - switch back to NodeJS 16
| -rw-r--r-- | pkgs/servers/openvscode-server/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 046a68f9d030..c970ffb73b39 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -107,6 +107,9 @@ in stdenv.mkDerivation rec { # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${yarnCache}" + + # set nodedir, so we can build binaries later + npm config set nodedir "${nodejs}" ''; buildPhase = '' @@ -143,7 +146,7 @@ in stdenv.mkDerivation rec { # rebuild binaries, we use npm here, as yarn does not provide an alternative # that would not attempt to try to reinstall everything and break our # patching attempts - npm --prefix ./remote rebuild --build-from-source --nodedir ${nodejs} + npm --prefix ./remote rebuild --build-from-source # run postinstall scripts after patching find . -path "*node_modules" -prune -o \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 588d7cfee196..d99b56065749 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35020,7 +35020,7 @@ with pkgs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; openvscode-server = callPackage ../servers/openvscode-server { - nodejs = nodejs_18; + nodejs = nodejs_16; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; inherit (darwin) cctools; }; |