haskell: Inline static overlay
We don't force `enableStaticLibraries` for Windows or WASM because it will just fail an assertion.
This commit is contained in:
@@ -50,15 +50,6 @@ self: super: let
|
||||
# ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ])
|
||||
;
|
||||
|
||||
# Force everything to link statically.
|
||||
haskellStaticAdapter = self: super: {
|
||||
mkDerivation = attrs: super.mkDerivation (attrs // {
|
||||
enableSharedLibraries = false;
|
||||
enableSharedExecutables = false;
|
||||
enableStaticLibraries = true;
|
||||
});
|
||||
};
|
||||
|
||||
removeUnknownConfigureFlags = f: with self.lib;
|
||||
remove "--disable-shared"
|
||||
(remove "--enable-static" f);
|
||||
@@ -102,12 +93,6 @@ in {
|
||||
clangStdenv = foldl (flip id) super.clangStdenv staticAdapters;
|
||||
libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters;
|
||||
|
||||
haskell = super.haskell // {
|
||||
packageOverrides = composeExtensions
|
||||
(super.haskell.packageOverrides or (_: _: {}))
|
||||
haskellStaticAdapter;
|
||||
};
|
||||
|
||||
zlib = super.zlib.override {
|
||||
# Don’t use new stdenv zlib because
|
||||
# it doesn’t like the --disable-shared flag
|
||||
|
||||
Reference in New Issue
Block a user