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

Merge pull request #21896 from Ericson2314/gawk

Browse Source 
Two changes in preperation of cross cleanup
This commit is contained in:
John Ericson 2017-01-14 17:58:22 -05:00 committed by GitHub
commit 94ad99e759
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/text/gawk/default.nix
View File

@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
|| stdenv.isFreeBSD || stdenv.isFreeBSD
); );
buildInputs = [ xz.bin ] nativeBuildInputs = [ xz.bin ];
++ stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv buildInputs =
stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
++ stdenv.lib.optional interactive readline ++ stdenv.lib.optional interactive readline
++ stdenv.lib.optional stdenv.isDarwin locale; ++ stdenv.lib.optional stdenv.isDarwin locale;

2
pkgs/top-level/release-cross.nix
View File

@ -24,7 +24,7 @@ let
/* Basic list of packages to be natively built, /* Basic list of packages to be natively built,
but need a crossSystem defined to get meaning */ but need a crossSystem defined to get meaning */
basicNativeDrv = { basicNativeDrv = {
gdbCross = nativePlatforms; gdbCross.nativeDrv = nativePlatforms;
}; };
basic = basicCrossDrv // basicNativeDrv; basic = basicCrossDrv // basicNativeDrv;