From f7b5083cb6f175834dc6dfc49c78cedb90eb0b0b Mon Sep 17 00:00:00 2001
From: Tobias Bergkvist <tobias@bergkv.ist>
Date: Fri, 10 Dec 2021 19:41:18 +0100
Subject: [PATCH] makeBinaryWrapper: Make tests discoverable to OfBorg

Move makeBinaryWrapper tests to pkgs.makeBinaryWrapper.passthru.tests, since OfBorg doesn't discover/skips the tests in the previous location.
---
 pkgs/test/default.nix           | 2 --
 pkgs/top-level/all-packages.nix | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index b73617daa895..e3ef7839c4b4 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -35,8 +35,6 @@ with pkgs;
 
   macOSSierraShared = callPackage ./macos-sierra-shared {};
 
-  make-binary-wrapper = callPackage ./make-binary-wrapper { inherit makeBinaryWrapper; };
-
   cross = callPackage ./cross {};
 
   php = recurseIntoAttrs (callPackages ./php {});
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6f1f8f4d28c..5f0beb6df04c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -696,7 +696,10 @@ with pkgs;
           --replace " @CC@ " " ${cc}/bin/cc ${san} "
       '';
     in
-      makeSetupHook { deps = [ dieHook ]; } script;
+      makeSetupHook {
+        deps = [ dieHook ];
+        substitutions.passthru.tests = callPackage ../test/make-binary-wrapper { inherit makeBinaryWrapper; };
+      } script;
   in
     lib.makeOverridable f {
       cc = stdenv.cc;