public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37460 from obsidiansystems/host-meta-platforms-fixes

Browse Source 
treewide: `meta.platforms` fixes now that it tracks the host platform
This commit is contained in:
John Ericson
2018-03-20 13:08:54 -04:00
committed by GitHub
parent ec8c3c82cc 65e24f22e6
commit 0c52fe9702
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/generic-builder.nix
View File

@@ -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; }
;
}