From f293272682bbfef8d5ef6e6a1544845eae907970 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 7 Jun 2024 09:13:55 -0700 Subject: [PATCH] perl: add cc in addition to makeBinaryWrapper. see NixOS#311794 The "correct" solution to this problem (makeBinaryWrapper fails to be able to compile the binary wrapper when building a freebsd cross env) is that makeBinaryWrapper should propagate or embed a reference to the compiler. However, this causes build failures on musl, so this will have to do for now. --- pkgs/development/interpreters/perl/wrapper.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index 8e4630b48e76..f86808306c55 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, perl, buildEnv, makeBinaryWrapper +{ lib, perl, buildEnv, makeBinaryWrapper, stdenv , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -17,7 +17,8 @@ let inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - nativeBuildInputs = [ makeBinaryWrapper ]; + # TODO: remove stdenv.cc as soon as it is added to propagatedNativeBuildInputs of makeBinaryWrapper + nativeBuildInputs = [ makeBinaryWrapper stdenv.cc ]; # we create wrapper for the binaries in the different packages postBuild = ''