Use top-level cctools when available

cctools was updated and migrated to the `by-name` hierarchy in nixpkgs, which moves it to the top-level. It is also being added to `darwin-aliases.nix`, which will make the old name unavailable for use in nixpkgs. This change preferentially uses the new name while falling back to the old one for out-of-tree users. Relevant nixpkgs PRs: - NixOS/nixpkgs#307880 - NixOS/nixpkgs#328077
reckenrode · Jul 18, 2024 · 31c308b · 31c308b
1 parent 315e1b8
commit 31c308b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/default.nix b/default.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ./nix/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {

diff --git a/lib/expressions/CompositionExpression.js b/lib/expressions/CompositionExpression.js
@@ -119,9 +119,13 @@ CompositionExpression.prototype.toNixAST = function() {
                             }),
                             thenExpr: new nijs.NixAttrReference({
                                 attrSetExpr: new nijs.NixExpression("pkgs"),
-                                refExpr: new nijs.NixAttrReference({
-                                    attrSetExpr: new nijs.NixExpression("darwin"),
-                                    refExpr: new nijs.NixExpression("cctools")
+                                refExpr: new nijs.NixExpression("cctools"),
+                                orExpr: new nijs.NixAttrReference({
+                                    attrSetExpr: new nijs.NixExpression("pkgs"),
+                                    refExpr: new nijs.NixAttrReference({
+                                        attrSetExpr: new nijs.NixExpression("darwin"),
+                                        refExpr: new nijs.NixExpression("cctools")
+                                    }),
                                 }),
                             }),
                             elseExpr: null

diff --git a/tests/default-v14.nix b/tests/default-v14.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../nix/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-v14.nix {

diff --git a/tests/default-v16.nix b/tests/default-v16.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../nix/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-v16.nix {

diff --git a/tests/grunt/default.nix b/tests/grunt/default.nix
@@ -12,7 +12,7 @@ let
   nodeEnv = import ../../nix/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {

diff --git a/tests/lockfile-v2/default.nix b/tests/lockfile-v2/default.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../nix/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {

diff --git a/tests/lockfile/default.nix b/tests/lockfile/default.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../nix/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {

diff --git a/tests/scoped/default.nix b/tests/scoped/default.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../nix/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {

diff --git a/tests/versionless/default.nix b/tests/versionless/default.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../nix/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {