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.
This commit is contained in:
parent
98662eba0e
commit
9e78f76ade
@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
|
|||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
"--sysconfdir=/etc"
|
"--sysconfdir=/etc"
|
||||||
"--disable-tests"
|
"--disable-tests"
|
||||||
"--disable-static"
|
|
||||||
"--disable-dmrc"
|
"--disable-dmrc"
|
||||||
] ++ optional withQt4 "--enable-liblightdm-qt"
|
] ++ optional withQt4 "--enable-liblightdm-qt"
|
||||||
++ optional withQt5 "--enable-liblightdm-qt5";
|
++ optional withQt5 "--enable-liblightdm-qt5";
|
||||||
|
@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-static"
|
|
||||||
"--disable-staticbins"
|
"--disable-staticbins"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--prefix=$(out)"
|
"--prefix=$(out)"
|
||||||
"--disable-static"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-x"
|
"--with-x"
|
||||||
"--disable-static"
|
|
||||||
"--enable-shape"
|
"--enable-shape"
|
||||||
"--enable-sm"
|
"--enable-sm"
|
||||||
"--enable-startup-notification"
|
"--enable-startup-notification"
|
||||||
|
@ -37,7 +37,6 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--enable-shared"
|
[ "--enable-shared"
|
||||||
"--disable-static"
|
|
||||||
"--enable-fortran"
|
"--enable-fortran"
|
||||||
"--enable-optimize"
|
"--enable-optimize"
|
||||||
"--with-pic=yes"
|
"--with-pic=yes"
|
||||||
|
@ -272,7 +272,7 @@ stdenv.mkDerivation rec {
|
|||||||
* Build flags
|
* Build flags
|
||||||
*/
|
*/
|
||||||
# On some ARM platforms --enable-thumb
|
# On some ARM platforms --enable-thumb
|
||||||
"--enable-shared --disable-static"
|
"--enable-shared"
|
||||||
(enableFeature true "pic")
|
(enableFeature true "pic")
|
||||||
(if stdenv.cc.isClang then "--cc=clang" else null)
|
(if stdenv.cc.isClang then "--cc=clang" else null)
|
||||||
(enableFeature smallBuild "small")
|
(enableFeature smallBuild "small")
|
||||||
|
@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
|
|||||||
"--enable-version3"
|
"--enable-version3"
|
||||||
# Build flags
|
# Build flags
|
||||||
"--enable-shared"
|
"--enable-shared"
|
||||||
"--disable-static"
|
|
||||||
(ifMinVer "0.6" "--enable-pic")
|
(ifMinVer "0.6" "--enable-pic")
|
||||||
(enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
|
(enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
|
||||||
"--enable-hardcoded-tables"
|
"--enable-hardcoded-tables"
|
||||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
|||||||
outputBin = "dev"; # fftw-wisdom
|
outputBin = "dev"; # fftw-wisdom
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--enable-shared" "--disable-static"
|
[ "--enable-shared"
|
||||||
"--enable-threads"
|
"--enable-threads"
|
||||||
]
|
]
|
||||||
++ optional (precision != "double") "--enable-${precision}"
|
++ optional (precision != "double") "--enable-${precision}"
|
||||||
|
@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
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
|
# native compiler to generate building tool
|
||||||
CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
|
CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
|
||||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
||||||
configureFlags = [ "--disable-static" "--enable-shared" ];
|
configureFlags = [ "--enable-shared" ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = https://www.openprinting.org/download/ijs/;
|
homepage = https://www.openprinting.org/download/ijs/;
|
||||||
|
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-static"
|
|
||||||
# "--enable-gtk-doc"
|
# "--enable-gtk-doc"
|
||||||
"--enable-man"
|
"--enable-man"
|
||||||
"--enable-valgrind-tests"
|
"--enable-valgrind-tests"
|
||||||
|
@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [ readline texinfo ];
|
buildInputs = [ readline texinfo ];
|
||||||
propagatedBuildInputs = [ gdbm gmp libffi ];
|
propagatedBuildInputs = [ gdbm gmp libffi ];
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--disable-static"
|
|
||||||
];
|
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -48,7 +48,6 @@ stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-static"
|
|
||||||
"--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
|
"--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
|
|||||||
(if isDarwin || isCygwin then
|
(if isDarwin || isCygwin then
|
||||||
"--enable-static --disable-shared"
|
"--enable-static --disable-shared"
|
||||||
else
|
else
|
||||||
"--disable-static --enable-shared")
|
"--enable-shared")
|
||||||
(enableFeature smallSupport "small")
|
(enableFeature smallSupport "small")
|
||||||
(enableFeature postprocVisualizerSupport "postproc-visualizer")
|
(enableFeature postprocVisualizerSupport "postproc-visualizer")
|
||||||
(enableFeature unitTestsSupport "unit-tests")
|
(enableFeature unitTestsSupport "unit-tests")
|
||||||
|
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||||||
++ optional imwriSupport imagemagick7;
|
++ optional imwriSupport imagemagick7;
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--disable-static"
|
|
||||||
(optionalString (!ocrSupport) "--disable-ocr")
|
(optionalString (!ocrSupport) "--disable-ocr")
|
||||||
(optionalString (!imwriSupport) "--disable-imwri")
|
(optionalString (!imwriSupport) "--disable-imwri")
|
||||||
];
|
];
|
||||||
|
@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
|
|||||||
"--with-openssl"
|
"--with-openssl"
|
||||||
"--with-xerces"
|
"--with-xerces"
|
||||||
"--with-xalan"
|
"--with-xalan"
|
||||||
"--disable-static"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
@ -243,7 +243,7 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
patchFlags = "-p0";
|
patchFlags = "-p0";
|
||||||
|
|
||||||
configureFlags = [ "--disable-static" "--enable-dependency-reduction" "--disable-frontend"];
|
configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"];
|
||||||
|
|
||||||
postConfigure = ''
|
postConfigure = ''
|
||||||
echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h
|
echo '#define NIX_ESCI_PREFIX "'${fwdir}'"' >> config.h
|
||||||
|
@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
|
|||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--with-serivec-port=${builtins.toString port}"
|
[ "--with-serivec-port=${builtins.toString port}"
|
||||||
"--with-service-name=${serviceName}"
|
"--with-service-name=${serviceName}"
|
||||||
# "--disable-static"
|
|
||||||
"--with-system-editline"
|
"--with-system-editline"
|
||||||
"--with-fblog=/var/log/firebird"
|
"--with-fblog=/var/log/firebird"
|
||||||
"--with-fbconf=/etc/firebird"
|
"--with-fbconf=/etc/firebird"
|
||||||
|
@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
|
|||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--enable-library"
|
"--enable-library"
|
||||||
"--enable-fuse"
|
"--enable-fuse"
|
||||||
"--disable-static"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -19,7 +19,6 @@ stdenv.mkDerivation {
|
|||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--enable-dns"
|
"--enable-dns"
|
||||||
"--enable-geoip"
|
"--enable-geoip"
|
||||||
"--disable-static"
|
|
||||||
"--enable-shared"
|
"--enable-shared"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user