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

Merge pull request #25895 from obsidiansystems/cross-tests

Browse Source 
release-cross: Do a recursive union to make sure we don't loose tests
This commit is contained in:
John Ericson 2017-05-18 10:57:27 -04:00 committed by GitHub
commit f6863bcf7a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,12 @@ let
gmp = nativePlatforms; gmp = nativePlatforms;
}; };
gnuCommon = common // { gnuCommon = lib.recursiveUpdate common {
buildPackages.gccCrossStageFinal = nativePlatforms; buildPackages.gccCrossStageFinal = nativePlatforms;
coreutils = nativePlatforms; coreutils = nativePlatforms;
}; };
linuxCommon = gnuCommon // { linuxCommon = lib.recursiveUpdate gnuCommon {
buildPackages.gdbCross = nativePlatforms; buildPackages.gdbCross = nativePlatforms;
bison = nativePlatforms; bison = nativePlatforms;
@ -33,7 +33,7 @@ let
patch = nativePlatforms; patch = nativePlatforms;
}; };
windowsCommon = gnuCommon // { windowsCommon = lib.recursiveUpdate gnuCommon {
boehmgc = nativePlatforms; boehmgc = nativePlatforms;
guile_1_8 = nativePlatforms; guile_1_8 = nativePlatforms;
libffi = nativePlatforms; libffi = nativePlatforms;