diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-20 11:51:37 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-20 13:02:53 -0400 |
| commit | 65e24f22e69ea18b5ec638f89a87e070d4e2154a (patch) | |
| tree | d03338b750ca737aedb054630ec5b0b921925093 /pkgs/development/haskell-modules | |
| parent | e49c14c35b73d464d0b3070de7802ca309f7bb6b (diff) | |
| download | nixlib-65e24f22e69ea18b5ec638f89a87e070d4e2154a.tar nixlib-65e24f22e69ea18b5ec638f89a87e070d4e2154a.tar.gz nixlib-65e24f22e69ea18b5ec638f89a87e070d4e2154a.tar.bz2 nixlib-65e24f22e69ea18b5ec638f89a87e070d4e2154a.tar.lz nixlib-65e24f22e69ea18b5ec638f89a87e070d4e2154a.tar.xz nixlib-65e24f22e69ea18b5ec638f89a87e070d4e2154a.tar.zst nixlib-65e24f22e69ea18b5ec638f89a87e070d4e2154a.zip | |
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.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 6 |
1 files 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; } ; } |