diff options
| author | Karel Kočí <cynerd@email.cz> | 2024-07-04 17:09:32 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2024-07-04 17:09:32 +0200 |
| commit | 8ac10c646a6e3ca4e9dd4eaf1ed8225b71cabd06 (patch) | |
| tree | ee93326eb5c71d6f1a948204bfc8ef423a4402ee /pkgs | |
| parent | 1861d5e398ccea9f2b19ff4bef438f86ba00a61d (diff) | |
| download | nixos-personal-8ac10c646a6e3ca4e9dd4eaf1ed8225b71cabd06.tar.gz nixos-personal-8ac10c646a6e3ca4e9dd4eaf1ed8225b71cabd06.tar.bz2 nixos-personal-8ac10c646a6e3ca4e9dd4eaf1ed8225b71cabd06.zip | |
Tweak the packages with system update
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/default.nix | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 0a09f9f..7094b78 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,12 @@ final: prev: let - inherit (final.lib) optional; - is_cross = final.buildPlatform != final.targetPlatform; + # 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 { luks-hw-password = final.callPackage ./luks-hw-password {}; dev = final.callPackage ./dev { @@ -24,9 +30,17 @@ in { bigclown-leds = final.callPackage ./bigclown-leds {}; # nixpkgs patches - #zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs (oldAttrs: { - # npmInstallFlags = ["--no-optional"]; # Fix cross build - #}); + zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs (oldAttrs: { + 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 { version = "1.3.4"; src = final.fetchurl { @@ -35,9 +49,4 @@ in { }; outputs = ["out"]; }; - gnupg = prev.gnupg.overrideAttrs (oldAttrs: { - nativeBuildInputs = - oldAttrs.nativeBuildInputs - ++ (optional is_cross prev.libgpg-error); - }); } |