public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv: resurrect the allowedRequisites check

Browse Source 
Discovered in #28091.  I'm sorry I forgot to re-check my TODOs, long ago.
This commit is contained in:
Vladimír Čunát 2017-08-13 11:44:36 +02:00
parent 6899c7fdb9
commit 505e94256e
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/stdenv/linux/default.nix
View File

@ -299,13 +299,21 @@ in
shellPackage = prevStage.bash; shellPackage = prevStage.bash;
}; };
/* outputs TODO # Mainly avoid reference to bootstrap tools
allowedRequisites = with prevStage; allowedRequisites = with prevStage; with lib;
# Simple executable tools
concatMap (p: [ (getBin p) (getLib p) ])
[ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv ]
] ++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; # Library dependencies
*/ ++ map getLib [ attr acl zlib pcre libsigsegv ]
# More complicated cases
++ [
glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
gcc gcc.cc gcc.cc.lib gcc.expandResponseParams
]
++ lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
overrides = self: super: { overrides = self: super: {
inherit (prevStage) inherit (prevStage)