summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2019-08-31 14:10:53 +0200
committerSamuel Leathers <disasm@gmail.com>2019-08-31 08:10:53 -0400
commit9e78f76aded0a098f7fd19f22d18f4c7f7c32ec0 (patch)
tree73f6b295201f1a8a6a727591041534c6cca949c3 /pkgs/development
parent98662eba0e99d462071003bcef55ee8b61ea4e86 (diff)
downloadnixpkgs-9e78f76aded0a098f7fd19f22d18f4c7f7c32ec0.tar
nixpkgs-9e78f76aded0a098f7fd19f22d18f4c7f7c32ec0.tar.gz
nixpkgs-9e78f76aded0a098f7fd19f22d18f4c7f7c32ec0.tar.bz2
nixpkgs-9e78f76aded0a098f7fd19f22d18f4c7f7c32ec0.tar.lz
nixpkgs-9e78f76aded0a098f7fd19f22d18f4c7f7c32ec0.tar.xz
nixpkgs-9e78f76aded0a098f7fd19f22d18f4c7f7c32ec0.tar.zst
nixpkgs-9e78f76aded0a098f7fd19f22d18f4c7f7c32ec0.zip
treewide: Remove unnecessary `--disable-static` (#66759)
* freetype: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes freetype not being overridable to have static libs.

* treewide: Remove unnecessary `--disable-static`.

The true-by-default `dontDisableStatic` already takes care of it.

Fixes these packages not being overridable to have static libs.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/blitz/default.nix1
-rw-r--r--pkgs/development/libraries/ffmpeg-full/default.nix2
-rw-r--r--pkgs/development/libraries/ffmpeg/generic.nix1
-rw-r--r--pkgs/development/libraries/fftw/default.nix2
-rw-r--r--pkgs/development/libraries/freetype/default.nix2
-rw-r--r--pkgs/development/libraries/ijs/default.nix2
-rw-r--r--pkgs/development/libraries/libpsl/default.nix1
-rw-r--r--pkgs/development/libraries/librep/default.nix4
-rw-r--r--pkgs/development/libraries/libunity/default.nix1
-rw-r--r--pkgs/development/libraries/libvpx/default.nix2
-rw-r--r--pkgs/development/libraries/vapoursynth/default.nix1
-rw-r--r--pkgs/development/libraries/xml-security-c/default.nix1
12 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 62f050cbcb8..fd0da496fa4 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation {
 
   configureFlags =
     [ "--enable-shared"
-      "--disable-static"
       "--enable-fortran"
       "--enable-optimize"
       "--with-pic=yes"
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 3b1aeeebaab..45a4f48fd33 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -272,7 +272,7 @@ stdenv.mkDerivation rec {
      *  Build flags
      */
     # On some ARM platforms --enable-thumb
-    "--enable-shared --disable-static"
+    "--enable-shared"
     (enableFeature true "pic")
     (if stdenv.cc.isClang then "--cc=clang" else null)
     (enableFeature smallBuild "small")
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index cf2dc56b90a..4c0ca0210cc 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
       "--enable-version3"
     # Build flags
       "--enable-shared"
-      "--disable-static"
       (ifMinVer "0.6" "--enable-pic")
       (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
       "--enable-hardcoded-tables"
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 07dbaeef165..c9577436c30 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   outputBin = "dev"; # fftw-wisdom
 
   configureFlags =
-    [ "--enable-shared" "--disable-static"
+    [ "--enable-shared"
       "--enable-threads"
     ]
     ++ optional (precision != "double") "--enable-${precision}"
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index eb26a241d1c..6eaf1bbcc2f 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ];
+  configureFlags = [ "--bindir=$(dev)/bin" "--enable-freetype-config" ];
 
   # native compiler to generate building tool
   CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index a5b226ee9c7..98a34477e4f 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  configureFlags = [ "--disable-static" "--enable-shared" ];
+  configureFlags = [ "--enable-shared" ];
 
   meta = with stdenv.lib; {
     homepage = https://www.openprinting.org/download/ijs/;
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 7e2443d31e9..15aa7c9e22d 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--disable-static"
 #    "--enable-gtk-doc"
     "--enable-man"
     "--enable-valgrind-tests"
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index f11a7eb1fe5..43f80076328 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline texinfo ];
   propagatedBuildInputs = [ gdbm gmp libffi ];
 
-  configureFlags = [
-    "--disable-static"
-  ];
-
   setupHook = ./setup-hook.sh;
 
   meta = {
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index 1adddadcc5e..2c042281f37 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = [
-    "--disable-static"
     "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
   ];
 
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index ee36365c03f..d80fe6a998c 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     (if isDarwin || isCygwin then
        "--enable-static --disable-shared"
      else
-       "--disable-static --enable-shared")
+       "--enable-shared")
     (enableFeature smallSupport "small")
     (enableFeature postprocVisualizerSupport "postproc-visualizer")
     (enableFeature unitTestsSupport "unit-tests")
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 53d70f4d369..0d96829b6ba 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     ++ optional imwriSupport imagemagick7;
 
   configureFlags = [
-    "--disable-static"
     (optionalString (!ocrSupport)   "--disable-ocr")
     (optionalString (!imwriSupport) "--disable-imwri")
   ];
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index e6ececf8513..74846c8306d 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
     "--with-openssl"
     "--with-xerces"
     "--with-xalan"
-    "--disable-static"
   ];
 
   nativeBuildInputs = [ pkgconfig ];