From d2a0e52d0979127183f90d067aa87825178c35c4 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 27 Feb 2025 17:55:13 +0000
Subject: [PATCH] testers.testBuildFailure': replace import with callPackage

---
 pkgs/build-support/testers/default.nix        |  3 +--
 .../testers/testBuildFailurePrime/default.nix | 20 ++++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index 4e0be62cc886..9934e84d7b5e 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -36,8 +36,7 @@
 
   # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailurePrime
   # or doc/build-helpers/testers.chapter.md
-  # NOTE: Must be `import`-ed rather than `callPackage`-d to preserve the `override` attribute.
-  testBuildFailure' = import ./testBuildFailurePrime { inherit lib stdenvNoCC testers; };
+  testBuildFailure' = callPackage ./testBuildFailurePrime { };
 
   # See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualDerivation
   # or doc/build-helpers/testers.chapter.md
diff --git a/pkgs/build-support/testers/testBuildFailurePrime/default.nix b/pkgs/build-support/testers/testBuildFailurePrime/default.nix
index 8b28e19dd1d7..a85b7ca1068d 100644
--- a/pkgs/build-support/testers/testBuildFailurePrime/default.nix
+++ b/pkgs/build-support/testers/testBuildFailurePrime/default.nix
@@ -1,14 +1,9 @@
-# NOTE: Must be `import`-ed rather than `callPackage`-d to preserve the `override` attribute.
 {
   lib,
   stdenvNoCC,
   testers,
 }:
 let
-  inherit (lib) maintainers;
-  inherit (lib.customisation) makeOverridable;
-  inherit (testers) testBuildFailure;
-
   # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailurePrime
   # or doc/build-helpers/testers.chapter.md
   testBuildFailure' =
@@ -19,18 +14,15 @@ let
       expectedBuilderLogEntries ? [ ],
       script ? "",
     }:
-    let
-      failed = testBuildFailure drv;
-    in
-    stdenvNoCC.mkDerivation {
+    stdenvNoCC.mkDerivation (finalAttrs: {
       __structuredAttrs = true;
       strictDeps = true;
 
       inherit name;
 
-      nativeBuildInputs = [ failed ];
+      nativeBuildInputs = [ finalAttrs.failed ];
 
-      inherit failed;
+      failed = testers.testBuildFailure drv;
 
       inherit expectedBuilderExitCode expectedBuilderLogEntries;
 
@@ -40,8 +32,8 @@ let
 
       meta = {
         description = "A wrapper around testers.testBuildFailure to simplify common use cases";
-        maintainers = [ maintainers.connorbaker ];
+        maintainers = [ lib.maintainers.connorbaker ];
       };
-    };
+    });
 in
-makeOverridable testBuildFailure'
+lib.makeOverridable testBuildFailure'