diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-19 23:54:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 23:54:17 +0200 |
| commit | 55e6e1b05e4aeeeef7b50873226e83bffedb2fef (patch) | |
| tree | 80ea3e65608bb04744ba884ca30c685908d679bb /pkgs | |
| parent | 9024d2e15d117176686b29994992e23da68d7428 (diff) | |
| parent | 1acbc939c57138f036472b88508b1394b486b86e (diff) | |
| download | nixlib-55e6e1b05e4aeeeef7b50873226e83bffedb2fef.tar nixlib-55e6e1b05e4aeeeef7b50873226e83bffedb2fef.tar.gz nixlib-55e6e1b05e4aeeeef7b50873226e83bffedb2fef.tar.bz2 nixlib-55e6e1b05e4aeeeef7b50873226e83bffedb2fef.tar.lz nixlib-55e6e1b05e4aeeeef7b50873226e83bffedb2fef.tar.xz nixlib-55e6e1b05e4aeeeef7b50873226e83bffedb2fef.tar.zst nixlib-55e6e1b05e4aeeeef7b50873226e83bffedb2fef.zip | |
Merge pull request #44932 from oxij/stdenv/no-texinfo-rebuild-try-2
stdenv: linux: inherit texinfo in stage4 instead of the final stdenv
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index ef46bdeb2133..bd0be1c9f9d5 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -263,7 +263,7 @@ in # because gcc (since JAR support) already depends on zlib, and # then if we already have a zlib we want to use that for the # other purposes (binutils and top-level pkgs) too. - inherit (prevStage) gettext gnum4 bison gmp perl zlib linuxHeaders; + inherit (prevStage) gettext gnum4 bison gmp perl texinfo zlib linuxHeaders; ${localSystem.libc} = getLibc prevStage; binutils = super.binutils.override { # Don't use stdenv's shell but our own @@ -344,7 +344,6 @@ in concatMap (p: [ (getBin p) (getLib p) ]) [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl - texinfo ] # Library dependencies ++ map getLib ( @@ -363,7 +362,7 @@ in inherit (prevStage) gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl paxctl zlib pcre texinfo; + attr acl paxctl zlib pcre; ${localSystem.libc} = getLibc prevStage; } // lib.optionalAttrs (super.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. |