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

Merge pull request #39457 from oxij/stdenv/texinfo-bash

Browse Source 
stdenv: change texinfo bootstrap handling; texinfo, bash: simplify expressions
This commit is contained in:
Michael Raskin
2018-04-27 19:03:26 +00:00
committed by GitHub
parent 6d95d1ddd8 d531a1e967
commit ce929e6a92
8 changed files with 144 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,6 +344,7 @@ 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 +364,7 @@ in
inherit (prevStage)
gzip bzip2 xz bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep gnupatch patchelf
attr acl paxctl zlib pcre;
attr acl paxctl zlib pcre texinfo;
${localSystem.libc} = getLibc prevStage;
} // lib.optionalAttrs (super.targetPlatform == localSystem) {
# Need to get rid of these when cross-compiling.