about summary refs log tree commit diff
path: root/pkgs/top-level/static.nix
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2019-12-06 19:07:01 +0100
committerGitHub <noreply@github.com>2019-12-06 19:07:01 +0100
commit3ccbce4b128a202753aa19fc6f8a34f46f86e8b3 (patch)
tree1df5b45d68203cf6604b4bba2fd069fb47a432b1 /pkgs/top-level/static.nix
parent34084d471e24205c211aa8384e0316680bfc1feb (diff)
parentf6ea33023e334fd18a9e35ec21e2021b6cb2de71 (diff)
downloadnixlib-3ccbce4b128a202753aa19fc6f8a34f46f86e8b3.tar
nixlib-3ccbce4b128a202753aa19fc6f8a34f46f86e8b3.tar.gz
nixlib-3ccbce4b128a202753aa19fc6f8a34f46f86e8b3.tar.bz2
nixlib-3ccbce4b128a202753aa19fc6f8a34f46f86e8b3.tar.lz
nixlib-3ccbce4b128a202753aa19fc6f8a34f46f86e8b3.tar.xz
nixlib-3ccbce4b128a202753aa19fc6f8a34f46f86e8b3.tar.zst
nixlib-3ccbce4b128a202753aa19fc6f8a34f46f86e8b3.zip
Merge pull request #74485 from malbarbo/e2fsprogs-shared
e2fsprogs: allow static build
Diffstat (limited to 'pkgs/top-level/static.nix')
-rw-r--r--pkgs/top-level/static.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 98a75e2df879..687086b6ed3b 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -115,14 +115,15 @@ in {
   } // optionalAttrs super.stdenv.hostPlatform.isDarwin {
     pythonSupport = false;
   });
-  zlib = (super.zlib.override {
+  zlib = super.zlib.override {
     static = true;
     shared = false;
+    splitStaticOutput = false;
 
     # Don’t use new stdenv zlib because
     # it doesn’t like the --disable-shared flag
     stdenv = super.stdenv;
-  }).static;
+  };
   xz = super.xz.override {
     enableStatic = true;
   };
@@ -214,6 +215,10 @@ in {
     gssSupport = false;
   };
 
+  e2fsprogs = super.e2fsprogs.override {
+    shared = false;
+  };
+
   brotli = super.brotli.override {
     staticOnly = true;
   };