treewide: Make all the rest of configureFlags

This commit is contained in:
John Ericson 2018-08-03 12:52:40 -04:00
parent f92ed87372
commit f0d6b385d1
19 changed files with 49 additions and 30 deletions

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
'';
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
configureFlags = stdenv.lib.optional withGNOME "--enable-gnome";
hardeningDisable = [ "format" ];

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib;
[ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ];
configureFlags = "--enable-ssl";
configureFlags = [ "--enable-ssl" ];
meta = with stdenv.lib; {
homepage = https://www.dillo.org/;

View file

@ -24,10 +24,13 @@ stdenv.mkDerivation rec {
++ optional withTcl tcl
++ optional withCyrus cyrus_sasl;
configureFlags = optionalString withPerl "--enable-perl "
+ optionalString withPython "--enable-python "
+ optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
+ optionalString withCyrus "--enable-cyrus ";
configureFlags = [
(stdenv.lib.enableFeature withPerl "perl")
(stdenv.lib.enableFeature withPython "python")
(stdenv.lib.enableFeature withTcl "tcl")
(stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib")
(stdenv.lib.enableFeature withCyrus "cyrus")
];
meta = with stdenv.lib; {
description = "Advanced IRC bouncer";

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
preCheck = stdenv.lib.optional doCheck ''
export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
'';
configureFlags = if withJson then "--json" else "";
configureFlags = stdenv.lib.optional withJson "--json";
preBuild=''
export USER=nonexistent-but-specified-user

View file

@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build"
'';
configureFlags="--prefix=";
NIX_LDFLAGS="-lgcc_s";
configureFlags= [ "--prefix=" ];
NIX_LDFLAGS = "-lgcc_s";
makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX=";

View file

@ -24,7 +24,9 @@ stdenv.mkDerivation {
./autogen.sh
'';
configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}";
configureFlags = [
(if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}")
];
buildPhase = "make 3-stage-bootstrap";
postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# Upstream strongly recommends against using --with-system-ffmpeg,
# but we do it anyway because we're so hardcore (and we don't want
# multiple copies of ffmpeg).
configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
configureFlags = stdenv.lib.optional (!useInternalFfmpeg) "--with-system-ffmpeg";
buildInputs =
[ pkgconfig bzip2 gst-plugins-base orc ]

View file

@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa";
};
configureFlags = if stdenv.is64bit then "--enable-64bit" else "";
configureFlags = stdenv.lib.optional stdenv.is64bit "--enable-64bit";
meta = with stdenv.lib; {
description = "C runtime libraries of ANTLR v3";

View file

@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
'';
configureFlags = if stdenv.cc.isClang
then [ "--disable-werror" ] else null;
configureFlags = stdenv.lib.optional stdenv.cc.isClang "--disable-werror";
CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses perl ];
configureFlags = stdenv.lib.optionalString (perl == null) "--with-perl-bindings=no";
configureFlags = stdenv.lib.optional (perl == null) "--with-perl-bindings=no";
meta = with stdenv.lib; {
description = "C library to generate ICMP echo requests (a.k.a. ping packets)";

View file

@ -10,7 +10,10 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared";
configureFlags = [
(stdenv.lib.enableFeature stdenv.isCygwin "static")
(stdenv.lib.enableFeature (!stdenv.isCygwin) "shared")
];
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg";
};
configureFlags = stdenv.lib.optionalString docSupport "--enable-doc";
configureFlags = stdenv.lib.optionals docSupport "--enable-doc";
buildInputs = [ yacc flex libusb libelf libftdi1 readline ]
++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ];

View file

@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
buildInputs = [ boost libtool groff ghostscript libgcrypt ];
configureFlags = stdenv.lib.optionalString
(libgcrypt == null) "--without-gcrypt";
configureFlags = [
(stdenv.lib.optional (libgcrypt == null) "--without-gcrypt")
];
meta = with stdenv.lib; {
description = "Collection of powerful tools for manipulating EPROM load files";

View file

@ -3,7 +3,7 @@
# flex 2.6.3 causes: undefined reference to `yywrap'
pkgconfig, fontforge, makeWrapper, flex_2_6_1, bison,
supportFlags,
buildScript ? null, configureFlags ? ""
buildScript ? null, configureFlags ? []
}:
with import ./util.nix { inherit lib; };

View file

@ -10,8 +10,11 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl zlib ];
configureFlags =
"--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl.dev}";
configureFlags = [
"--with-nicklen=100"
"--with-topiclen=360"
"--enable-openssl=${openssl.dev}"
];
postInstall = "echo postinstall; mkdir -p \${out}/ ; rm -rf \${out}/logs ; ln -s /home/ircd \${out}/logs;";

View file

@ -12,8 +12,13 @@ stdenv.mkDerivation {
sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc";
};
configureFlags =
"--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib";
configureFlags = [
"--disable-readline"
"--enable-udev_rules"
"--enable-udev_sync"
"--enable-pkgconfig"
"--enable-applib"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ systemd ];

View file

@ -18,9 +18,10 @@ stdenv.mkDerivation {
sh autogen.sh
'';
configureFlags = if gccCross != null then
"--enable-firmware CROSS_COMPILE=${gccCross.targetPrefix}"
else "";
configureFlags = stdenv.lib.optionals (gccCross != null) [
"--enable-firmware"
"CROSS_COMPILE=${gccCross.targetPrefix}"
];
hardeningDisable = [ "pic" "stackprotector" ];

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.in --replace ' install-exec-hook' ""
'';
configureFlags = stdenv.lib.optionalString (!withGtk) "--without-gtk";
configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk";
nativeBuildInputs = [ autoreconfHook pkgconfig ];

View file

@ -34,8 +34,9 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (libpsl != null) libpsl
++ stdenv.lib.optional stdenv.isDarwin perl;
configureFlags =
if openssl != null then "--with-ssl=openssl" else "--without-ssl";
configureFlags = [
(stdenv.lib.withFeatureAs (openssl != null) "ssl" openssl)
];
doCheck = false;