diff options
19 files changed, 49 insertions, 30 deletions
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 949dce7132b..4780c823697 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -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" ]; diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 73094767bf3..ab1e0822bf1 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -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/; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 30fa41de12d..ca5624d5b73 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -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"; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 1373e13c414..396ed10392c 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -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 diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 1b1bb8147d3..5bc9ad8852a 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -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="; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index d00080282d7..17d474359da 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -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"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 95b394a6d4b..9c9243a1c68 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -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 ] diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index ef583818859..6f12bf891b0 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -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"; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 8b5130b0eac..01452e2d6f5 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -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 diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index c177f7ba58e..ca026811d69 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -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)"; diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix index 115f4cd90a0..3ca84ed2ce5 100644 --- a/pkgs/development/libraries/librsync/0.9.nix +++ b/pkgs/development/libraries/librsync/0.9.nix @@ -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; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 66b0467657a..4475e58207e 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index 94a452ce083..a76a180741e 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -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"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0ff6f3f041e..d56a485c152 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -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; }; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index c73c69e6ee5..cf5b572c9eb 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -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;"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 1ddcbb2376c..7c92dc95268 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -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 ]; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index b25be641897..ca642035a0b 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -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" ]; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 8932360c717..3c2ced1712f 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -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 ]; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 5c1636ddb86..cd1801318a6 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -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; |