From 0d6bcb513bf2f2fe92ff8b2fae75da95007a03e3 Mon Sep 17 00:00:00 2001
From: Naïm Favier <n@monade.li>
Date: Tue, 10 May 2022 15:51:43 +0200
Subject: makeBinaryWrapper: move into its own folder

The derivation is complex enough to warrant moving out of
all-packages.nix
---
 pkgs/test/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pkgs/test')

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 2ab03bda8b7..e3253498958 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -71,7 +71,13 @@ with pkgs;
 
   dhall = callPackage ./dhall { };
 
-  makeWrapper = callPackage ./make-wrapper {};
+  makeWrapper = callPackage ./make-wrapper { };
+  makeBinaryWrapper = callPackage ./make-binary-wrapper {
+    makeBinaryWrapper = pkgs.makeBinaryWrapper.override {
+      sanitizers = pkgs.lib.optionals (! (pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64))
+        [ "undefined" "address" ];
+    };
+  };
 
   pkgs-lib = recurseIntoAttrs (import ../pkgs-lib/tests { inherit pkgs; });
 }
-- 
cgit 1.4.1


From 3e385d9a8262fedc647f59aebc5464d7a9212c1a Mon Sep 17 00:00:00 2001
From: Naïm Favier <n@monade.li>
Date: Thu, 12 May 2022 15:23:38 +0200
Subject: makeBinaryWrapper: add comment

---
 pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix | 4 +---
 pkgs/test/default.nix                                          | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/test')

diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
index 318624011b7..fd0fa3ea009 100644
--- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
+++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
@@ -15,9 +15,7 @@ makeSetupHook {
     ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) darwin.cctools;
 
   substitutions = {
-    cc = let
-      san = lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers);
-    in "${cc}/bin/cc ${san}";
+    cc = "${cc}/bin/cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";
 
     # Extract the function call used to create a binary wrapper from its embedded docstring
     passthru.extractCmd = writeShellScript "extract-binary-wrapper-cmd" ''
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index e3253498958..4b850f1509c 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -74,6 +74,8 @@ with pkgs;
   makeWrapper = callPackage ./make-wrapper { };
   makeBinaryWrapper = callPackage ./make-binary-wrapper {
     makeBinaryWrapper = pkgs.makeBinaryWrapper.override {
+      # Enable sanitizers in the tests only, to avoid the performance cost in regular usage.
+      # The sanitizers cause errors on aarch64-darwin, see https://github.com/NixOS/nixpkgs/pull/150079#issuecomment-994132734
       sanitizers = pkgs.lib.optionals (! (pkgs.stdenv.isDarwin && pkgs.stdenv.isAarch64))
         [ "undefined" "address" ];
     };
-- 
cgit 1.4.1