diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-11-06 11:59:21 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-04-25 11:28:17 +0200 |
commit | aad577bd30b0ab16a7859973c88edd6d0d5becde (patch) | |
tree | 7f24e0060e8644031402d0e2770ca080aeea4f7a /pkgs/servers/code-server | |
parent | 1c6cb4cabd84351cbc2dbc2dec4f5636a75f543a (diff) |
nodejs*: normalise names to better fit other packages
Versioned package attributes are usually named like $pname_$version
eg: nodejs-14_x -> nodejs_14
Diffstat (limited to 'pkgs/servers/code-server')
-rw-r--r-- | pkgs/servers/code-server/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 05808d605d26..8f0416c6ad32 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper , cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3 -, esbuild, nodejs-16_x, node-gyp, libsecret, xorg, ripgrep +, esbuild, nodejs_16, node-gyp, libsecret, xorg, ripgrep , AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-16_x; + nodejs = nodejs_16; python = python3; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; @@ -241,7 +241,7 @@ in stdenv.mkDerivation rec { ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent # create wrapper - makeWrapper "${nodejs-16_x}/bin/node" "$out/bin/code-server" \ + makeWrapper "${nodejs_16}/bin/node" "$out/bin/code-server" \ --add-flags "$out/libexec/code-server/out/node/entry.js" ''; |