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

Fix stdenv allowedRequisites check

Browse Source 
It has to include the default build inputs now (like
"compress-man-pages.sh").
This commit is contained in:
Eelco Dolstra 2014-11-06 13:33:08 +01:00
parent 328f7a621e
commit e3ef797901
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/generic/default.nix
View File

@ -120,7 +120,7 @@ let
# The stdenv that we are producing. # The stdenv that we are producing.
result = result =
derivation ( derivation (
(if isNull allowedRequisites then {} else { inherit allowedRequisites; }) // (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
{ {
inherit system name; inherit system name;

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

@ -287,7 +287,8 @@ rec {
allowedRequisites = with stage4.pkgs; allowedRequisites = with stage4.pkgs;
[ 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 glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv ]; paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv
];
overrides = pkgs: { overrides = pkgs: {
inherit gcc; inherit gcc;