From 65e24f22e69ea18b5ec638f89a87e070d4e2154a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 20 Mar 2018 11:51:37 -0400 Subject: [PATCH] haskell-generic-builder: Default to window + unix platforms, Since GHC is a cross compiler, it's perfectly possible to make haskell binaries on platforms without GHCs. `windows ++ unix` seems good enough for now. Also don't default `hydraPlatforms` to `platforms`. The former must be a list of systems (strings), but the latter is a list of systems or patterns. --- pkgs/development/haskell-modules/generic-builder.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 1a788ae642ea..3cdf2e2252b2 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -34,8 +34,8 @@ in , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" -, platforms ? ghc.meta.platforms -, hydraPlatforms ? platforms +, platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile +, hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false @@ -404,7 +404,7 @@ stdenv.mkDerivation ({ // optionalAttrs broken { inherit broken; } // optionalAttrs (description != "") { inherit description; } // optionalAttrs (maintainers != []) { inherit maintainers; } - // optionalAttrs (hydraPlatforms != platforms) { inherit hydraPlatforms; } + // optionalAttrs (hydraPlatforms != null) { inherit hydraPlatforms; } ; }