diff options
| author | Peter Simons <simons@cryp.to> | 2015-09-02 16:51:35 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-09-02 16:51:35 +0200 |
| commit | dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257 (patch) | |
| tree | aa5416d8dcebef8285ea8282233a9b64e91fdb50 | |
| parent | 07542d12eaf344c7e0c7b9e9735826eecba607c5 (diff) | |
| download | nixpkgs-dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257.tar nixpkgs-dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257.tar.gz nixpkgs-dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257.tar.bz2 nixpkgs-dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257.tar.lz nixpkgs-dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257.tar.xz nixpkgs-dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257.tar.zst nixpkgs-dc5bf39bfe5bfb14d2cf03ec7fad92dfed726257.zip | |
haskell-generic-builder: improve meta.platforms vs. meta.hydraPlatforms logic
hydraPlatforms now defaults to the value of meta.platforms rather than defaulting to ghc.meta.hydraPlatforms. This solution is, in fact, still sub-optimal. See https://github.com/NixOS/nixpkgs/issues/9608 for further details.
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c04d8fdb409..3442e873080 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -22,7 +22,8 @@ , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" -, hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms +, platforms ? ghc.meta.platforms +, hydraPlatforms ? platforms , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false @@ -31,7 +32,6 @@ , doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8" , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] -, platforms ? ghc.meta.platforms , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] , testTarget ? "" , broken ? false |