diff options
| author | Ryan Trinkle <ryan.trinkle@gmail.com> | 2017-06-22 21:43:03 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-31 14:04:10 -0400 |
| commit | c425a1fc5002a1642036a74d67b200e47f19cefb (patch) | |
| tree | 714478d46838a43d371361fd1ec52f4c7513d68b /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 218ada1ba7ecb0a3b1d9e7aed9147ba35d484faa (diff) | |
| download | nixlib-c425a1fc5002a1642036a74d67b200e47f19cefb.tar nixlib-c425a1fc5002a1642036a74d67b200e47f19cefb.tar.gz nixlib-c425a1fc5002a1642036a74d67b200e47f19cefb.tar.bz2 nixlib-c425a1fc5002a1642036a74d67b200e47f19cefb.tar.lz nixlib-c425a1fc5002a1642036a74d67b200e47f19cefb.tar.xz nixlib-c425a1fc5002a1642036a74d67b200e47f19cefb.tar.zst nixlib-c425a1fc5002a1642036a74d67b200e47f19cefb.zip | |
haskell: add *FrameworkDepends arguments
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a1b92595c78d..941ba31d34c3 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -35,6 +35,10 @@ in , enableStaticLibraries ? !hostPlatform.isWindows , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] +# On macOS, statically linking against system frameworks is not supported; +# see https://developer.apple.com/library/content/qa/qa1118/_index.html +# They must be propagated to the environment of any executable linking with the library +, libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" , platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile , hydraPlatforms ? null @@ -47,8 +51,8 @@ in , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] -, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] -, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [] +, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? [] +, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? [] , testTarget ? "" , broken ? false , preCompileBuildDriver ? "", postCompileBuildDriver ? "" @@ -178,11 +182,11 @@ let nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++ setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; - propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; - otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ + propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends; + otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++ allPkgconfigDepends ++ - optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ - optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); + optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++ + optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; |