diff options
| author | Karel Kočí <cynerd@email.cz> | 2024-10-02 09:33:34 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2024-10-02 09:33:34 +0200 |
| commit | fdb4d847c643043d7ecdf42cdeba3b3b75132e6f (patch) | |
| tree | ca6a151cf4b7cbab6881a9b0e57ae26b8ab9c923 | |
| parent | 65a9e7cd89ab452bb3c75cfa496d0dcd90b3707d (diff) | |
| download | nixos-personal-fdb4d847c643043d7ecdf42cdeba3b3b75132e6f.tar.gz nixos-personal-fdb4d847c643043d7ecdf42cdeba3b3b75132e6f.tar.bz2 nixos-personal-fdb4d847c643043d7ecdf42cdeba3b3b75132e6f.zip | |
pkgs: remove nodejs patches
This is no longer required because upstream merged:
https://github.com/NixOS/nixpkgs/pull/327653
| -rw-r--r-- | pkgs/default.nix | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 68c6951..7424caa 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,13 +1,4 @@ -final: prev: let - # The NodeJS packages has to be build in 32bit environment if host platform is - # also 32bit because it uses 32bit stubs and links against 32bit OpenSSL. The - # only architecture that generally supports execution of 32bit is x86_64 and - # thus that is the only one handled here. - callPackageNodejs = - if prev.stdenv.buildPlatform.isx86_64 && prev.stdenv.is32bit - then prev.buildPackages.pkgsi686Linux.callPackage - else prev.callPackage; -in { +final: prev: { luks-hw-password = final.callPackage ./luks-hw-password {}; dev = final.callPackage ./dev { devShells = import ../devShells final; @@ -35,12 +26,6 @@ in { zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs { npmInstallFlags = ["--no-optional"]; # Fix cross build }; - nodejs_18 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v18.nix") {}; - nodejs-slim_18 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v18.nix") {enableNpm = false;}; - nodejs_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {}; - nodejs-slim_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {enableNpm = false;}; - nodejs_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {}; - nodejs-slim_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {enableNpm = false;}; # Older version of packages flac1_3 = prev.flac.overrideAttrs { |