summaryrefslogtreecommitdiffstats
path: root/pkgs
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
parent98662eba0e99d462071003bcef55ee8b61ea4e86 (diff)
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')
-rw-r--r--pkgs/applications/display-managers/lightdm/default.nix1
-rw-r--r--pkgs/applications/misc/kiwix/default.nix1
-rw-r--r--pkgs/applications/science/electronics/alliance/default.nix1
-rw-r--r--pkgs/desktops/gnome-3/core/mutter/3.28.nix1
-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
-rw-r--r--pkgs/misc/drivers/epkowa/default.nix2
-rw-r--r--pkgs/servers/firebird/default.nix1
-rw-r--r--pkgs/tools/filesystems/avfs/default.nix1
-rw-r--r--pkgs/tools/networking/webalizer/default.nix1
20 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 61d65cb64b6b..7aeed5d91cc9 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--sysconfdir=/etc"
"--disable-tests"
- "--disable-static"
"--disable-dmrc"
] ++ optional withQt4 "--enable-liblightdm-qt"
++ optional withQt5 "--enable-liblightdm-qt5";
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 89778f670ff3..898186b714b6 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--disable-static"
"--disable-staticbins"
];
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix
index b351c892c2cf..c863fe6aea85 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/pkgs/applications/science/electronics/alliance/default.nix
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--prefix=$(out)"
- "--disable-static"
];
preConfigure = ''
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 7e1f696c58d1..262383bdda94 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-x"
- "--disable-static"
"--enable-shape"
"--enable-sm"
"--enable-startup-notification"
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 62f050cbcb85..fd0da496fa40 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 3b1aeeebaabd..45a4f48fd337 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 cf2dc56b90a1..4c0ca0210cc8 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 07dbaeef1654..c9577436c300 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 eb26a241d1cd..6eaf1bbcc2f4 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 a5b226ee9c74..98a34477e4f1 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 7e2443d31e92..15aa7c9e22d1 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 f11a7eb1fe54..43f80076328e 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 1adddadcc5ea..2c042281f37a 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 ee36365c03ff..d80fe6a998c9 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 53d70f4d369d..0d96829b6baf 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 e6ececf8513e..74846c8306dd 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 ];
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index a232552712d6..bdc8b3a75df8 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -243,7 +243,7 @@ stdenv.mkDerivation rec {
];
patchFlags = "-p0";
- configureFlags = [ "--disable-static" "--enable-dependency-reduction" "--disable-frontend"];
+ configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"];
postConfigure = ''
echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 31de59259161..40780c9a97b2 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--with-serivec-port=${builtins.toString port}"
"--with-service-name=${serviceName}"
- # "--disable-static"
"--with-system-editline"
"--with-fblog=/var/log/firebird"
"--with-fbconf=/etc/firebird"
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index b95a9ad68a82..b66d67fbc9f2 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-library"
"--enable-fuse"
- "--disable-static"
];
meta = {
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index e9b9452c7563..bd80eae2bebc 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
configureFlags = [
"--enable-dns"
"--enable-geoip"
- "--disable-static"
"--enable-shared"
];