From f82a1d12eb60abd555c0a8a0fbd407411bb0eca3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 27 May 2024 18:01:22 +0200 Subject: [PATCH] Revert "make-binary-wrapper: add cc to propagatedBuildInputs" This reverts commit 0c34636a5690cf8d75ecbab62d41179c56571f79. Seems to be causing some weird side effects. pkgsMusl.systemd no longer builds: Command line: `clang /run/user/1008/tmp.WuVNjgdfHT/source/build/meson-private/tmpdd3qc57v/testfile.c -o /run/user/1008/tmp.WuVNjgdfHT/source/build/meson-private/tmpdd3qc57v/output.obj -c -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -std=gnu11` -> 1 stderr: clang: error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument] --- pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 28ad33027853..f364dd5de753 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -10,7 +10,7 @@ makeSetupHook { name = "make-binary-wrapper-hook"; - propagatedBuildInputs = [ dieHook cc ]; + propagatedBuildInputs = [ dieHook ]; substitutions = { cc = "${cc}/bin/${cc.targetPrefix}cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";