Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: Remove unnecessary --disable-static #66759

Merged
merged 2 commits into from
Aug 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkgs/applications/display-managers/lightdm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/misc/kiwix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
'';

configureFlags = [
"--disable-static"
"--disable-staticbins"
];

Expand Down
1 change: 0 additions & 1 deletion pkgs/applications/science/electronics/alliance/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ stdenv.mkDerivation rec {

configureFlags = [
"--prefix=$(out)"
"--disable-static"
];

preConfigure = ''
Expand Down
1 change: 0 additions & 1 deletion pkgs/desktops/gnome-3/core/mutter/3.28.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ stdenv.mkDerivation rec {

configureFlags = [
"--with-x"
"--disable-static"
"--enable-shape"
"--enable-sm"
"--enable-startup-notification"
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/blitz/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ stdenv.mkDerivation rec {

configureFlags =
[ "--enable-shared"
"--disable-static"
"--enable-fortran"
"--enable-optimize"
"--with-pic=yes"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/ffmpeg-full/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,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")
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/ffmpeg/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/fftw/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
outputBin = "dev"; # fftw-wisdom

configureFlags =
[ "--enable-shared" "--disable-static"
[ "--enable-shared"
"--enable-threads"
]
++ optional (precision != "double") "--enable-${precision}"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/freetype/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/ijs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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/;
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/libpsl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
'';

configureFlags = [
"--disable-static"
# "--enable-gtk-doc"
"--enable-man"
"--enable-valgrind-tests"
Expand Down
4 changes: 0 additions & 4 deletions pkgs/development/libraries/librep/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
buildInputs = [ readline texinfo ];
propagatedBuildInputs = [ gdbm gmp libffi ];

configureFlags = [
"--disable-static"
];

setupHook = ./setup-hook.sh;

meta = {
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/libunity/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
'';

configureFlags = [
"--disable-static"
"--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libvpx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/vapoursynth/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
++ optional imwriSupport imagemagick7;

configureFlags = [
"--disable-static"
(optionalString (!ocrSupport) "--disable-ocr")
(optionalString (!imwriSupport) "--disable-imwri")
];
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/xml-security-c/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
"--with-openssl"
"--with-xerces"
"--with-xalan"
"--disable-static"
];

nativeBuildInputs = [ pkgconfig ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/misc/drivers/epkowa/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pkgs/servers/firebird/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion pkgs/tools/filesystems/avfs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-library"
"--enable-fuse"
"--disable-static"
];

meta = {
Expand Down
1 change: 0 additions & 1 deletion pkgs/tools/networking/webalizer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ stdenv.mkDerivation {
configureFlags = [
"--enable-dns"
"--enable-geoip"
"--disable-static"
"--enable-shared"
];

Expand Down