summary refs log tree commit diff
path: root/pkgs/top-level/release-cross.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-01-22 11:29:15 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-01-22 11:29:15 -0500
commit13739e6b9ea8df61e6e9d08639ceb77660cbda5a (patch)
treeb97fc9e058583394df4e308adc08700237e4b750 /pkgs/top-level/release-cross.nix
parentbf687907d749d79d199d706b4901fbae73bf9e9a (diff)
downloadnixpkgs-13739e6b9ea8df61e6e9d08639ceb77660cbda5a.tar
nixpkgs-13739e6b9ea8df61e6e9d08639ceb77660cbda5a.tar.gz
nixpkgs-13739e6b9ea8df61e6e9d08639ceb77660cbda5a.tar.bz2
nixpkgs-13739e6b9ea8df61e6e9d08639ceb77660cbda5a.tar.lz
nixpkgs-13739e6b9ea8df61e6e9d08639ceb77660cbda5a.tar.xz
nixpkgs-13739e6b9ea8df61e6e9d08639ceb77660cbda5a.tar.zst
nixpkgs-13739e6b9ea8df61e6e9d08639ceb77660cbda5a.zip
release-cross: Try building on Windows too
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r--pkgs/top-level/release-cross.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 69982330965..8e1213f2344 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 */