diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2016-12-26 14:42:48 -0800 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-01-25 09:24:55 -0500 |
commit | c869fe022e9db78f779f687e4ac4d7ce5578f447 (patch) | |
tree | 31d792dcf8eafdb6988510c4e7532fe6426f1328 /pkgs/top-level/release-cross.nix | |
parent | 39fb46f5384bd4d28f1b10580ac9227c4ed36da2 (diff) |
top-level: no more need to expose `splicedPackages`
This was just done temporarily on the last cross-overhauling PR for
testing purposes.
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r-- | pkgs/top-level/release-cross.nix | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 48f183162cf8..f9382985fcd1 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -14,17 +14,17 @@ let /* Basic list of packages to cross-build */ basicCrossDrv = { - gccCrossStageFinal = nativePlatforms; - bison.crossDrv = nativePlatforms; - busybox.crossDrv = nativePlatforms; - coreutils.crossDrv = nativePlatforms; - dropbear.crossDrv = nativePlatforms; + bison = nativePlatforms; + busybox = nativePlatforms; + coreutils = nativePlatforms; + dropbear = nativePlatforms; }; /* Basic list of packages to be natively built, but need a crossSystem defined to get meaning */ basicNativeDrv = { - gdbCross.nativeDrv = nativePlatforms; + buildPackages.gccCrossStageFinal = nativePlatforms; + buildPackages.gdbCross = nativePlatforms; }; basic = basicCrossDrv // basicNativeDrv; @@ -85,7 +85,7 @@ in openssl.system = "linux-generic32"; }; in mapTestOnCross crossSystem (basic // { - ubootSheevaplug.crossDrv = nativePlatforms; + ubootSheevaplug = nativePlatforms; }); @@ -98,14 +98,14 @@ in platform = {}; }; in mapTestOnCross crossSystem { - coreutils.crossDrv = nativePlatforms; - boehmgc.crossDrv = nativePlatforms; - gmp.crossDrv = nativePlatforms; - guile_1_8.crossDrv = nativePlatforms; - libffi.crossDrv = nativePlatforms; - libtool.crossDrv = nativePlatforms; - libunistring.crossDrv = nativePlatforms; - windows.wxMSW.crossDrv = nativePlatforms; + coreutils = nativePlatforms; + boehmgc = nativePlatforms; + gmp = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; }; @@ -119,14 +119,14 @@ in platform = {}; }; in mapTestOnCross crossSystem { - coreutils.crossDrv = nativePlatforms; - boehmgc.crossDrv = nativePlatforms; - gmp.crossDrv = nativePlatforms; - guile_1_8.crossDrv = nativePlatforms; - libffi.crossDrv = nativePlatforms; - libtool.crossDrv = nativePlatforms; - libunistring.crossDrv = nativePlatforms; - windows.wxMSW.crossDrv = nativePlatforms; + coreutils = nativePlatforms; + boehmgc = nativePlatforms; + gmp = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; }; @@ -156,9 +156,9 @@ in }; }; in mapTestOnCross crossSystem { - coreutils.crossDrv = nativePlatforms; - ed.crossDrv = nativePlatforms; - patch.crossDrv = nativePlatforms; + coreutils = nativePlatforms; + ed = nativePlatforms; + patch = nativePlatforms; }; @@ -182,16 +182,16 @@ in }; }; in mapTestOnCross crossSystem { - coreutils.crossDrv = nativePlatforms; - ed.crossDrv = nativePlatforms; - patch.crossDrv = nativePlatforms; - vim.crossDrv = nativePlatforms; - unzip.crossDrv = nativePlatforms; - ddrescue.crossDrv = nativePlatforms; - lynx.crossDrv = nativePlatforms; - patchelf.crossDrv = nativePlatforms; - binutils.crossDrv = nativePlatforms; - mpg123.crossDrv = nativePlatforms; + coreutils = nativePlatforms; + ed = nativePlatforms; + patch = nativePlatforms; + vim = nativePlatforms; + unzip = nativePlatforms; + ddrescue = nativePlatforms; + lynx = nativePlatforms; + patchelf = nativePlatforms; + buildPackages.binutils = nativePlatforms; + mpg123 = nativePlatforms; }; |