Merge pull request #74485 from malbarbo/e2fsprogs-shared

e2fsprogs: allow static build
2019-12-06 19:07:01 +01:00
parent 34084d471e f6ea33023e
commit 3ccbce4b12
2 changed files with 11 additions and 4 deletions
@@ -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;
  };