checkMkDerivationFor: Fix with finalAttrs

Fixes: #131
jtojnar · Nov 4, 2023 · 6141217 · 6141217
1 parent 29fb792
commit 6141217
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/lib/default.nix b/lib/default.nix
@@ -58,8 +58,15 @@ rec {
     let
       originalDrv = originalFunction args;
       namePosition = originalDrv.meta.position or null;
+      resolvedArgs =
+        if builtins.isFunction args then
+          # Resolve recursive attributes in mkDerivation
+          # https://nixos.org/manual/nixpkgs/stable/#mkderivation-recursive-attributes
+          lib.fix (finalAttrs: args finalAttrs // { finalPackage = originalDrv; })
+        else
+          args;
     in
-      addReports originalDrv (check args originalDrv);
+      addReports originalDrv (check resolvedArgs originalDrv);
 
   # Creates an overlay that replaces stdenv.mkDerivation with a function that
   # checks the attribute set passed as argument to mkDerivation.

diff --git a/run-tests.py b/run-tests.py
@@ -229,6 +229,7 @@ def __iter__(self):
             "no-flags-array",
             [
                 "make",
+                "make-finalAttrs",
             ],
         )
 

diff --git a/tests/no-flags-array/default.nix b/tests/no-flags-array/default.nix
@@ -4,4 +4,5 @@
 {
   # positive cases
   make = callPackage ./make.nix { };
+  make-finalAttrs = callPackage ./make-finalAttrs.nix { };
 }
diff --git a/tests/no-flags-array/make-finalAttrs.nix b/tests/no-flags-array/make-finalAttrs.nix
@@ -0,0 +1,13 @@
+{ stdenv
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  name = "no-flags-array-make";
+
+  src = ../fixtures/make;
+
+  makeFlagsArray = [
+    "PREFIX=${placeholder "out"}"
+    "LIBDIR=${placeholder "out"}/lib"
+  ];
+})
-Original file line number
+Diff line change
@@ Expand Up / @@ -229,6 +229,7 @@ def __iter__(self): @@
                 "no-flags-array",
                 [
                     "make",
+                    "make-finalAttrs",
                 ],
             )
@@ Expand Down @@