diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-05-31 09:46:12 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-06-01 11:57:33 +0000 |
| commit | ffd81cd16788e4fa0d8d5c909fb0a141f8d108c1 (patch) | |
| tree | 1c020052e981faf395a67b61bffdd5bb3e91ad5d | |
| parent | Merge pull request #235356 from NixOS/backport-235348-to-release-23.05 (diff) | |
| download | nixpkgs-ffd81cd16788e4fa0d8d5c909fb0a141f8d108c1.tar.gz | |
openvscode-server: revert #232887
switch back to NodeJS 16 since microsoft/vscode does not support NodeJS 18 yet
(cherry picked from commit 1e708950b0b9bd0f7d3f773b2533aae94222c806)
| -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; }; |