diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-06 13:27:15 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-06 13:28:07 +0200 |
commit | b70924bd80918d153a5e2023afd7647ae7b24a12 (patch) | |
tree | 77213af020644bbcf909b66ab708f3d74cfa11b1 /pkgs/top-level/release-cross.nix | |
parent | 37a48c91996cde06adebcd4988b89f6e5e7c79dd (diff) | |
download | nixpkgs-b70924bd80918d153a5e2023afd7647ae7b24a12.tar nixpkgs-b70924bd80918d153a5e2023afd7647ae7b24a12.tar.gz nixpkgs-b70924bd80918d153a5e2023afd7647ae7b24a12.tar.bz2 nixpkgs-b70924bd80918d153a5e2023afd7647ae7b24a12.tar.lz nixpkgs-b70924bd80918d153a5e2023afd7647ae7b24a12.tar.xz nixpkgs-b70924bd80918d153a5e2023afd7647ae7b24a12.tar.zst nixpkgs-b70924bd80918d153a5e2023afd7647ae7b24a12.zip |
Revert "Merge pull request #25275 from Ericson2314/platform-normalize"
This reverts commit 2282a5774cd80567644a44d31585bf965a55f9ec, reversing changes made to 14adea91566019549f33392d4710d9babd0108d7. The lib tests are bloking nixpkgs-unstable, and I don't like debugging it soon enough.
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r-- | pkgs/top-level/release-cross.nix | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index b22eff33dc0..82428972699 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -20,27 +20,12 @@ let /* Basic list of packages to be natively built, but need a crossSystem defined to get meaning */ basicNativeDrv = { - buildPackages.binutils = nativePlatforms; buildPackages.gccCrossStageFinal = nativePlatforms; buildPackages.gdbCross = nativePlatforms; }; basic = basicCrossDrv // basicNativeDrv; - windows = { - buildPackages.binutils = nativePlatforms; - buildPackages.gccCrossStageFinal = nativePlatforms; - - coreutils = nativePlatforms; - boehmgc = nativePlatforms; - gmp = nativePlatforms; - guile_1_8 = nativePlatforms; - libffi = nativePlatforms; - libtool = nativePlatforms; - libunistring = nativePlatforms; - windows.wxMSW = nativePlatforms; - }; - in { @@ -104,30 +89,48 @@ in /* Test some cross builds on 32 bit mingw-w64 */ crossMingw32 = let crossSystem = { - config = "i686-pc-mingw32"; + config = "i686-w64-mingw32"; arch = "x86"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; - in mapTestOnCross crossSystem windows; + in mapTestOnCross crossSystem { + coreutils = nativePlatforms; + boehmgc = nativePlatforms; + gmp = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; + }; /* Test some cross builds on 64 bit mingw-w64 */ crossMingwW64 = let crossSystem = { # That's the triplet they use in the mingw-w64 docs. - config = "x86_64-pc-mingw32"; + config = "x86_64-w64-mingw32"; arch = "x86_64"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; - in mapTestOnCross crossSystem windows; + in mapTestOnCross crossSystem { + coreutils = nativePlatforms; + boehmgc = nativePlatforms; + gmp = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; + }; /* Linux on the fuloong */ fuloongminipc = let crossSystem = { - config = "mips64el-unknown-linux-gnu"; + config = "mips64el-unknown-linux"; bigEndian = false; arch = "mips"; float = "hard"; |