From 13739e6b9ea8df61e6e9d08639ceb77660cbda5a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 22 Jan 2018 11:29:15 -0500 Subject: [PATCH] release-cross: Try building on Windows too --- pkgs/top-level/release-cross.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 69982330965d..8e1213f2344d 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -21,6 +21,8 @@ let gnuCommon = lib.recursiveUpdate common { buildPackages.gcc = nativePlatforms; coreutils = nativePlatforms; + haskell.packages.ghcHEAD.hello = nativePlatforms; + haskell.packages.ghc822.hello = nativePlatforms; }; linuxCommon = lib.recursiveUpdate gnuCommon { @@ -117,14 +119,10 @@ in patchelf = nativePlatforms; buildPackages.binutils = nativePlatforms; mpg123 = nativePlatforms; - haskell.packages.ghcHEAD.hello = nativePlatforms; - haskell.packages.ghc822.hello = nativePlatforms; }); /* Linux on Aarch64 (TODO make android for real) */ android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // { - haskell.packages.ghcHEAD.hello = nativePlatforms; - haskell.packages.ghc822.hello = nativePlatforms; }); /* Cross-built bootstrap tools for every supported platform */