diff options
author | Peter Simons <simons@cryp.to> | 2021-01-14 20:22:32 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2021-01-14 20:22:32 +0100 |
commit | 8a3d3089b473db2393212f554bc31138805cbe71 (patch) | |
tree | ecaade4e7f57ec15a05f4f7a39a2ad3fc8c79919 /pkgs/development/haskell-modules | |
parent | fa28faeb1e30e66cf49a94afd44fb7f29ce8a69e (diff) | |
parent | 983cd52d2f3b923761a2c766fb9e1f8df835f11b (diff) | |
download | nixlib-8a3d3089b473db2393212f554bc31138805cbe71.tar nixlib-8a3d3089b473db2393212f554bc31138805cbe71.tar.gz nixlib-8a3d3089b473db2393212f554bc31138805cbe71.tar.bz2 nixlib-8a3d3089b473db2393212f554bc31138805cbe71.tar.lz nixlib-8a3d3089b473db2393212f554bc31138805cbe71.tar.xz nixlib-8a3d3089b473db2393212f554bc31138805cbe71.tar.zst nixlib-8a3d3089b473db2393212f554bc31138805cbe71.zip |
Merge remote-tracking branch 'origin/master' into haskell-updates.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a221ce38c8a2..e135374511fb 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -33,7 +33,7 @@ in , profilingDetail ? "exported-functions" # TODO enable shared libs for cross-compiling , enableSharedExecutables ? false -, enableSharedLibraries ? (ghc.enableShared or false) +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic && (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" |