From 8ac10c646a6e3ca4e9dd4eaf1ed8225b71cabd06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 4 Jul 2024 17:09:32 +0200
Subject: Tweak the packages with system update

---
 pkgs/default.nix | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'pkgs')

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);
-  });
 }
-- 
cgit v1.2.3