dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

glibc: enable strictDeps

Browse Source 
verified by building and diffing 'glibc' and 'glibcInfo'
This commit is contained in:
Artturin 2022-05-22 06:32:47 +03:00
parent 6b46fa896e
commit 0f9ee45a6d
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/glibc/common.nix
View File

@ -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;

2
pkgs/development/libraries/glibc/info.nix
View File

@ -7,7 +7,7 @@ callPackage ./common.nix {} {
configureFlags = [ "--enable-add-ons" ];
buildInputs = [ texinfo perl ];
extraNativeBuildInputs = [ texinfo perl ];
buildPhase = "make info";

10
pkgs/development/libraries/glibc/mtrace.nix
View File

@ -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).";
};
})