diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-05 03:39:32 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-11 03:17:29 +0000 |
| commit | a52f9a18bf28c63b3e1b9ceb542ff36245a54c09 (patch) | |
| tree | e40b404c8be198dfb933e5786b723f7ce83bd9a2 /pkgs/top-level/static.nix | |
| parent | 178ec8974ff70ef0acffa4cc8f47f3234898ff3d (diff) | |
| download | nixpkgs-a52f9a18bf28c63b3e1b9ceb542ff36245a54c09.tar nixpkgs-a52f9a18bf28c63b3e1b9ceb542ff36245a54c09.tar.gz nixpkgs-a52f9a18bf28c63b3e1b9ceb542ff36245a54c09.tar.bz2 nixpkgs-a52f9a18bf28c63b3e1b9ceb542ff36245a54c09.tar.lz nixpkgs-a52f9a18bf28c63b3e1b9ceb542ff36245a54c09.tar.xz nixpkgs-a52f9a18bf28c63b3e1b9ceb542ff36245a54c09.tar.zst nixpkgs-a52f9a18bf28c63b3e1b9ceb542ff36245a54c09.zip | |
haskell: Inline static overlay
We don't force `enableStaticLibraries` for Windows or WASM because it will just fail an assertion.
Diffstat (limited to 'pkgs/top-level/static.nix')
| -rw-r--r-- | pkgs/top-level/static.nix | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 48e4618762a..b3fe7bf8c94 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -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 |