diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 91c3d55926a3..9ba56ae5c617 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -203,6 +203,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; + strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison python3Minimal ] ++ extraNativeBuildInputs; buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ] ++ extraBuildInputs; diff --git a/pkgs/development/libraries/glibc/info.nix b/pkgs/development/libraries/glibc/info.nix index 7c4f3f63bf1c..04b0dc00a894 100644 --- a/pkgs/development/libraries/glibc/info.nix +++ b/pkgs/development/libraries/glibc/info.nix @@ -7,7 +7,7 @@ callPackage ./common.nix {} { configureFlags = [ "--enable-add-ons" ]; - buildInputs = [ texinfo perl ]; + extraNativeBuildInputs = [ texinfo perl ]; buildPhase = "make info"; diff --git a/pkgs/development/libraries/glibc/mtrace.nix b/pkgs/development/libraries/glibc/mtrace.nix index fed24aff2796..4dbcb19af2a4 100644 --- a/pkgs/development/libraries/glibc/mtrace.nix +++ b/pkgs/development/libraries/glibc/mtrace.nix @@ -8,7 +8,7 @@ # `glibc` needs to be overridden here because it's still needed to `./configure` the source in order # to have a build environment where we can call the needed make target. -glibc.overrideAttrs ({ meta ? {}, ... }: { +glibc.overrideAttrs (oldAttrs: { pname = "glibc-mtrace"; buildPhase = '' @@ -25,14 +25,16 @@ glibc.overrideAttrs ({ meta ? {}, ... }: { mv malloc/mtrace $out/bin/ ''; - # Perl interpreter used for `mtrace`. - buildInputs = [ perl ]; + # Perl checked during configure + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ perl ]; + # Perl shebang used for `mtrace`. + buildInputs = oldAttrs.buildInputs ++ [ perl ]; # Reset a few things declared by `pkgs.glibc`. outputs = [ "out" ]; separateDebugInfo = false; - meta = meta // { + meta = oldAttrs.meta // { description = "Perl script used to interpret and provide human readable output of the trace log contained in the file mtracedata, whose contents were produced by mtrace(3)."; }; })