diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 13:33:08 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 15:33:36 +0100 |
| commit | e3ef7979013dbc77a6f5abe8f76b201d3d97ab52 (patch) | |
| tree | 2c1ef6f3dc5bd38ad7e3fba6e622ecafb14bb25c | |
| parent | 328f7a621e0e2c37159e4cdd86fa279417fa3b9e (diff) | |
| download | nixlib-e3ef7979013dbc77a6f5abe8f76b201d3d97ab52.tar nixlib-e3ef7979013dbc77a6f5abe8f76b201d3d97ab52.tar.gz nixlib-e3ef7979013dbc77a6f5abe8f76b201d3d97ab52.tar.bz2 nixlib-e3ef7979013dbc77a6f5abe8f76b201d3d97ab52.tar.lz nixlib-e3ef7979013dbc77a6f5abe8f76b201d3d97ab52.tar.xz nixlib-e3ef7979013dbc77a6f5abe8f76b201d3d97ab52.tar.zst nixlib-e3ef7979013dbc77a6f5abe8f76b201d3d97ab52.zip | |
Fix stdenv allowedRequisites check
It has to include the default build inputs now (like "compress-man-pages.sh").
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index d59e8b6b94e8..2d7a13010095 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -120,7 +120,7 @@ let # The stdenv that we are producing. result = derivation ( - (if isNull allowedRequisites then {} else { inherit allowedRequisites; }) // + (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) // { inherit system name; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 0467b60ca476..76849c2c61ab 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -287,7 +287,8 @@ rec { allowedRequisites = with stage4.pkgs; [ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk 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: { inherit gcc; |