diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-25 17:44:21 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-03 17:06:03 -0400 |
| commit | db965063b346a33cc3f6363a40cbde2658d2cd23 (patch) | |
| tree | f6c76998d8a18f09d782000922a0429cbaacf8b9 | |
| parent | 85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e (diff) | |
treewide: Make configureFlags lists
164 files changed, 380 insertions, 263 deletions
diff --git a/doc/old/cross.txt b/doc/old/cross.txt index 73103ea0c6d9c..c0885c08176e9 100644 --- a/doc/old/cross.txt +++ b/doc/old/cross.txt @@ -64,7 +64,7 @@ stdenv.mkDerivation { sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np"; }; inherit noSysDirs; - configureFlags = "--target=arm-linux"; + configureFlags = [ "--target=arm-linux" ]; } --- diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 65df1b89430e7..389db3d548d64 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gtk2 alsaLib libglade ]; - configureFlags = "--disable-jack"; + configureFlags = [ "--disable-jack" ]; meta = { description = "Not a Guitar-Only tuner"; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 3a77c7bbbf246..88b636679cbd1 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pkgconfig libpulseaudio makeWrapper ]; - configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; + configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; postInstall = '' wrapProgram $out/bin/mhwaveedit \ diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 22786304faa9b..ab1a6e387383a 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { export ac_cv_prog_ac_ct_WINDRES= ''; - configureFlags = "--enable-dependency-tracking"; + configureFlags = [ "--enable-dependency-tracking" ]; buildInputs = [ alsaLib python SDL ]; diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index f47c8fa2eec77..d7d5b65375e9b 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo libdvdread pkgconfig x264 libmpeg2 xvidcore ]; - configureFlags = "--disable-ffmpeg --disable-libavcodec --disable-libavformat - --enable-lzo --enable-ogg --enable-vorbis --enable-theora --enable-libxml2 - --enable-x264 --enable-libmpeg2 --enable-xvid"; + configureFlags = [ + "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" + "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" + "--enable-x264" "--enable-libmpeg2" "--enable-xvid" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index b9bd529930f23..078b8a03b5d99 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - configureFlags = "--ioctl=termios"; + configureFlags = [ "--ioctl=termios" ]; meta = { homepage = http://elvis.vi-editor.org/; diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index 0ab11b5bf2043..689bcfc9adfdd 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./install-infodir.patch ]; buildInputs = [emacs texinfo ctags]; - configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; + configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ]; preInstall = "mkdir -p $out/info"; installTargets = "install-pkg texinfo"; postInstall = '' diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index 70693d039c588..9b737a938a124 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [emacs]; - configureFlags = "--with-lispdir=$$out/share/emacs/site-lisp"; + configureFlags = [ "--with-lispdir=$$out/share/emacs/site-lisp" ]; meta = { description = "Emacs mode for the programming language Maude"; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index 4542de2d42fac..56388a8a2555a 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; - configureFlags = "--disable-svnversion"; + configureFlags = [ "--disable-svnversion" ]; patches = map fetchurl (import ./debian-patches.nix); diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index acd38d74dca4a..ee3e2a955d322 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXext xorg.libXinerama jansson ]; configureScript = "./autogen.sh"; - configureFlags = "--enable-scrypt --enable-opencl"; + configureFlags = [ "--enable-scrypt" "--enable-opencl" ]; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; preConfigure = '' diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 5cd8f572ad488..7aee6cb708166 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - configureFlags = "--with-ssl=${openssl.dev}"; + configureFlags = [ "--with-ssl=${openssl.dev}" ]; meta = { homepage = http://www.fetchmail.info/; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index be853e4213bc7..1fad5333a144b 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" ''; - configureFlags = "--disable-pycompile"; + configureFlags = [ "--disable-pycompile" ]; meta = { homepage = https://fontmanager.github.io/; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 6adc805b72849..712c2081f102c 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop ''; - configureFlags = "--disable-nautilus-extension"; + configureFlags = [ "--disable-nautilus-extension" ]; meta = { description = "A graphical frontend for libgksu"; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index d8b1253ac2763..3561fcde839d2 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ db gtk2 bzip2 ]; - configureFlags = "--without-libdb"; + configureFlags = [ "--without-libdb" ]; meta = { description = "Download utility that can fetch files from several sources simultaneously"; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 8e8126192ddaf..f602ce9db66ad 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gnome3.gsettings-desktop-schemas ]; - configureFlags = "--libexecdir=$(out)/bin"; + configureFlags = [ "--libexecdir=$(out)/bin" ]; preFixup = '' wrapProgram "$out/bin/notify-osd" \ diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index 2b0573f2d2d1a..6b38c3d59c29d 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { HOME=$TMPDIR ''; - configureFlags = " - --without-arts --disable-docs - --x-includes=${libX11.dev}/include - --x-libraries=${libX11.out}/lib - --with-qt-dir=${qt3} - "; + configureFlags = [ + "--without-arts" "--disable-docs" + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + "--with-qt-dir=${qt3}" + ]; preInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 71d95e1389275..a2e3fa13fc6a5 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { ''; # Needs the path to `tclConfig.sh' and `tkConfig.sh'. - configureFlags = "--with-tcl=" + tcl + "/lib " + - "--with-tk=" + tk + "/lib"; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + ]; postInstall = '' wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 3dc154351d2f0..9af105ad52eb6 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; - configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; + configureFlags = [ + "--enable-nfq-module=yes" + "--with-dnet-includes=${libdnet}/includes" + "--with-dnet-libraries=${libdnet}/lib" + ]; meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index ff19a62ef3061..0fdfbacb45cf9 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,7 +14,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib"; + configureFlags = [ + "--disable-static-daq" + "--enable-control-socket" + "--with-daq-includes=${daq}/includes" + "--with-daq-libraries=${daq}/lib" + ]; postInstall = '' wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine" diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index e6ffd72afa5a4..6ff51445718b2 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -7,7 +7,11 @@ stdenv.mkDerivation { sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; }; - configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--enable-static" + ]; buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 6a697790d8f98..d86d62021fbd9 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; - configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; + configureFlags = [ + "--with-openssl=${openssl.dev}" + "--enable-modules" + "--enable-otr" + ]; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index dca7d1257f651..1219440bf8335 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - configureFlags = "--with-ncurses=${ncurses.dev}"; + configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; preConfigure = stdenv.lib.optionalString enablePlugin '' configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 525a8a313f442..a0cc73da46d86 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { checkInputs = [ dbus.daemon ]; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 82ad57ae92720..f6e3baadb4e8a 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { dbus telepathy-glib.python ]; - configureFlags = "--enable-call"; + configureFlags = [ "--enable-call" ]; preFixup = '' wrapProgram "$out/libexec/telepathy-logger" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index bae7231e783f7..68c81d380782f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libxslt pkgconfigUpstream ]; - configureFlags = "--disable-avahi-tests"; + configureFlags = [ "--disable-avahi-tests" ]; meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index d761be2d7ac55..9f775f0db656f 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation { -e "s|/bin/rm|rm|" ''; - configureFlags = "--with-slang=${slang.dev} --with-ssl=${openssl.dev}"; + configureFlags = [ + "--with-slang=${slang.dev}" + "--with-ssl=${openssl.dev}" + ]; buildInputs = [ slang ncurses openssl ]; diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix index b4e962ce3fcf4..9aa4cc6431593 100644 --- a/pkgs/applications/office/gnucash/2.4.nix +++ b/pkgs/applications/office/gnucash/2.4.nix @@ -27,7 +27,13 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ gconf ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; + configureFlags = [ + "CFLAGS=-O3" + "CXXFLAGS=-O3" + "--disable-dbi" + "--enable-ofx" + "--enable-aqbanking" + ]; postInstall = '' # Auto-updaters don't make sense in Nix. diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index badc02a364631..e196b1bd0d77a 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f"; }; - configureFlags = "--disable-component"; + configureFlags = [ "--disable-component" ]; prePatch = '' substituteInPlace doc/C/gnumeric.xml \ diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index 6fb8f6ca903e0..49b258c43fdba 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ emacs gmp pcre expat ]; - configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; + configureFlags = [ + "CPPFLAGS=-DNDEBUG" + "CFLAGS=-O3" + "CXXFLAGS=-O3" + ]; doCheck = true; diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index 821a80230e509..1c24ef0925421 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; }; - configureFlags = "--without-debug --with-bin-release --with-dll --without-static"; + configureFlags = [ + "--without-debug" + "--with-bin-release" + "--with-dll" + "--without-static" + ]; buildInputs = [ cpio ]; meta = { diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index e080569e56fb2..93fe7b6ba77ac 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; }; - configureFlags = "--disable-update-xdg-database"; + configureFlags = [ + "--disable-update-xdg-database" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile gtk2 flex gawk perl ]; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index ba2a170e62556..418144e6af7b1 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -17,7 +17,11 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook automake pkgconfig ]; hardeningDisable = [ "format" ]; - configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --with-ngspice=${getBin ngspice}/bin/ngspice"; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--with-ngspice=${getBin ngspice}/bin/ngspice" + ]; buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ]; diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 95f5385fac3db..0e978f2d5c9d2 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's/ *CC *= *gcc$//' -i Makefile.vars ''; - configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man"; + configureFlags = [ + "--exec-prefix=$(out)" + "--man-prefix=$(out)/share/man" + ]; meta = with stdenv.lib; { description = "Automated theorem prover for full first-order logic with equality"; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 5eb33daefe807..d6a1eb6cbf717 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -15,7 +15,7 @@ in let polymlEnableShared = with pkgs; lib.overrideDerivation polyml (attrs: { - configureFlags = "--enable-shared"; + configureFlags = [ "--enable-shared" ]; }); in diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 689261abc661f..93aefbca21601 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; }; - configureFlags = "-C"; + configureFlags = [ "-C" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 944460de9c754..18b13e11d350f 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ginsh"; - configureFlags = "--disable-rpath"; + configureFlags = [ "--disable-rpath" ]; meta = with stdenv.lib; { description = "GiNaC is Not a CAS"; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index a1b8769617c9f..01bd1c6fd80c5 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-server"; + configureFlags = [ "--disable-server" ]; meta = { description = "Free software for distributed and grid computing"; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 3d2bf1f1a4f5f..6c473e2d8dcaf 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages - configureFlags = "--enable-local-ffmpeg=no"; + configureFlags = [ "--enable-local-ffmpeg=no" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b75145a3e4a3c..69fc68a69debe 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; - configureFlags = "--with-readline=${readline.dev}"; + configureFlags = [ "--with-readline=${readline.dev}" ]; LIRC_CFLAGS="-I${lirc}/include"; LIRC_LIBS="-L ${lirc}/lib -llirc_client"; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index ff05cb7570660..fccb389071c8b 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = "--localstatedir=/var"; + configureFlags = [ "--localstatedir=/var" ]; installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy"; fixupPhase = '' diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 928c5396b61c2..d38f6485f135b 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; - configureFlags = "--enable-png-creation"; + configureFlags = [ "--enable-png-creation" ]; postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index c4f6ad8207c2f..b4d82e0cffbcc 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -18,5 +18,5 @@ stdenv.mkDerivation { libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon libSM docbook_xml_dtd_412 ]; - configureFlags = "--disable-scrollkeeper"; + configureFlags = [ "--disable-scrollkeeper" ]; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix index b99f23555d38f..d3d3649988659 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "17bkng6ay37n3492lr9wpb49kms6gh554rn9gbjs27zygvvfrjsm"; }; - configureFlags = "--disable-scrollkeeper"; + configureFlags = [ "--disable-scrollkeeper" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python libxml2Python libxslt which libX11 gtk intltool GConf gnome-doc-utils ]; diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index 47f2b8c90fb74..b358c31267478 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/libgweather/2.30/${name}.tar.bz2"; sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq"; }; - configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo"; + configureFlags = [ "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; } diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 62a224eb504a5..4b769f5d0aea9 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -15,5 +15,5 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl perlXMLParser libxml2 libxslt gettext]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml"; + configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ]; } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 0233f6340f554..5eb0068e2cdfd 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1b0qxb07wif0ds1pl8xk3fq9p874j89rf718lii4ndh7382bwf48"; }; - configureFlags = "--disable-scrollkeeper"; + configureFlags = [ "--disable-scrollkeeper" ]; buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ]; nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index bea40431a24e9..981b8504487bb 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; - configureFlags = "--disable-fatal-warnings"; + configureFlags = [ "--disable-fatal-warnings" ]; NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"]; diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix index 9cd36cd775033..aeef5114435d2 100644 --- a/pkgs/desktops/gnome-3/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/core/rest/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libsoup gobjectIntrospection]; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 36bfa596e19c6..bc5a78c5a4b2f 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mate.mate-settings-daemon ]; - configureFlags = "--disable-update-mimedb"; + configureFlags = [ "--disable-update-mimedb" ]; meta = with stdenv.lib; { description = "Utilities to configure the MATE desktop"; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 3289ff5081b5d..b4ace8cc9252d 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mate.mate-menus ]; - configureFlags = "--without-console-kit"; + configureFlags = [ "--without-console-kit" ]; makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 0f281cfc004e8..c3f29dff6319c 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { systemd ]; - configureFlags = "--enable-systemd"; + configureFlags = [ "--enable-systemd" ]; meta = with stdenv.lib; { description = "System monitor for the MATE desktop"; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 7b9e00b105db5..06ed7c51e9ab3 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; - configureFlags = "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind "; + configureFlags = [ "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind" ]; buildInputs = [ which perl jdk openssl coreutils zlib ncurses makeWrapper gcc binutils gnumake nodejs diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 670a00e250f29..77d943110d17e 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -20,7 +20,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - configureFlags = "--with-world --enable-gmp --enable-shared"; + configureFlags = [ + "--with-world" + "--enable-gmp" + "--enable-shared" + ]; buildFlags = "world"; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 8426635ce962b..68fa3d3613fdd 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure ''; - configureFlags = "--with-openssl=${openssl.dev}"; + configureFlags = [ "--with-openssl=${openssl.dev}" ]; preConfigure = '' export PGHEADER="${postgresql}/include/libpq-fe.h"; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 7c6b545285cc7..3ad0bc25787e3 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline gmp zlib ]; - configureFlags = "--enable-tabling=yes"; + configureFlags = [ "--enable-tabling=yes" ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index c4dc8b5fc5b9e..baad637cbb735 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ coq ]; propagatedBuildInputs = [ ssreflect ]; - configureFlags = "--libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Coquelicot"; + configureFlags = [ "--libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Coquelicot" ]; buildPhase = "./remake"; installPhase = "./remake install"; diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 9ab43e7392d77..0a54a916ba736 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -67,15 +67,15 @@ stdenv.mkDerivation rec { substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" ''; - configureFlags = "builddir" - + stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules" - + stdenv.lib.optionalString (readline != null) " --with-readline" + configureFlags = [ "builddir" ] + ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" + ++ stdenv.lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - + stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi" - + stdenv.lib.optionalString ffcallAvailable " --with-ffcall" - + stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall" - + stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules - + stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS"; + ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" + ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ builtins.map (x: "--with-module=" + x) withModules + ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 9839220796c7d..47dbf8a225cfe 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -62,15 +62,15 @@ stdenv.mkDerivation rec { substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" ''; - configureFlags = "builddir" - + stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules" - + stdenv.lib.optionalString (readline != null) " --with-readline" + configureFlags = [ "builddir" ] + ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules" + ++ stdenv.lib.optional (readline != null) "--with-readline" # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise - + stdenv.lib.optionalString (ffcallAvailable && (libffi != null)) " --with-dynamic-ffi" - + stdenv.lib.optionalString ffcallAvailable " --with-ffcall" - + stdenv.lib.optionalString (!ffcallAvailable) " --without-ffcall" - + stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules - + stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS"; + ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi" + ++ stdenv.lib.optional ffcallAvailable "--with-ffcall" + ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall" + ++ builtins.map (x: " --with-module=" + x) withModules + ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS"; preBuild = '' sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 0209c41abee39..8b1878b0cc301 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; - configureFlags = "--without-x --with-ncurses=${ncurses.dev}"; + configureFlags = [ "--without-x" "--with-ncurses=${ncurses.dev}" ]; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index ab30985809506..c0539aeed4764 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib --enable-examples=no"; + configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" "--enable-examples=no" ]; # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o # libtool: error: cannot find the library 'libexamples.la' diff --git a/pkgs/development/libraries/arb/git.nix b/pkgs/development/libraries/arb/git.nix index 87b884fece10a..a281e2a085feb 100644 --- a/pkgs/development/libraries/arb/git.nix +++ b/pkgs/development/libraries/arb/git.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { rev = "10bc615ce5999caf4723444b2b1219b74781d8a4"; sha256 = "1xb40x3hv9nh76aizhskj5gdhalgn7r95a7zji2nn4ih3lmh40hl"; }; - buildInputs = [mpir gmp mpfr flint]; - configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}"; + buildInputs = [ mpir gmp mpfr flint ]; + configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ]; meta = { inherit version; description = ''A library for arbitrary-precision interval arithmetic''; diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index a48de9a03f21b..238901e2ec4ff 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz; sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; }; - buildInputs = [m4]; - configureFlags = "--disable-optimized --enable-static"; + buildInputs = [ m4 ]; + configureFlags = [ "--disable-optimized" "--enable-static" ]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 00e236eba8c3d..a8555a349d08e 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; patches = [ ./gcc-4.3.3-fixes.patch ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3"; + configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ]; doCheck = true; meta = { diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index cd1789a13bbd2..fd4d8d5ca31b0 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -10,7 +10,14 @@ stdenv.mkDerivation rec { PYTHON_SITE = "$(out)/site-packages"; - configureFlags = "--with-python=${python}/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp"; + configureFlags = [ + "--with-python=${python}/bin/python" + "--disable-apache" + "--disable-perl" + "--disable-ruby" + "--disable-java" + "--disable-csharp" + ]; preInstall = '' mkdir -p $out diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 0ce0af97ec941..47037339d417c 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-ppl-version.patch ]; - configureFlags = "--with-ppl=${ppl}"; + configureFlags = [ "--with-ppl=${ppl}" ]; preAutoreconf = '' touch NEWS ChangeLog AUTHORS diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 606058da85458..ee646b24c81a3 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = "--without-python"; + configureFlags = [ "--without-python" ]; prePatch = '' sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 0514058114380..6190f6ddc52a1 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus glib expat ]; - configureFlags = "--disable-ecore"; + configureFlags = [ "--disable-ecore" ]; meta = with stdenv.lib; { homepage = http://dbus-cplusplus.sourceforge.net; diff --git a/pkgs/development/libraries/fflas-ffpack/1.nix b/pkgs/development/libraries/fflas-ffpack/1.nix index 5efa378ff5fa3..eae0326c832f2 100644 --- a/pkgs/development/libraries/fflas-ffpack/1.nix +++ b/pkgs/development/libraries/fflas-ffpack/1.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ givaro_3_7 openblas gmpxx]; - configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}"; + configureFlags = [ + "--with-blas=-lopenblas" + "--with-gmp=${gmpxx.dev}" + "--with-givaro=${givaro_3_7}" + ]; meta = { inherit version; description = ''Finite Field Linear Algebra Subroutines''; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 2af7bbce18bc8..a4e0bcfb52b03 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation (rec { # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from # <sys/socket.h> with Glibc 2.9. - configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; + configureFlags = [ + "--disable-debug" + "--with-python=${python}" + "CPPFLAGS=-D_GNU_SOURCE" + ]; patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 287c332438656..54ee7662d06e9 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # needs fonts otherwise don't know how to pass them - configureFlags = "--disable-docs"; + configureFlags = [ "--disable-docs" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index ccfa7e536111d..e90cc257e7e87 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { })]; # needs fonts otherwise don't know how to pass them - configureFlags = "--disable-docs"; + configureFlags = [ "--disable-docs" ]; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 9c19bdbdc29a0..71da2c716f844 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libidn kerberos ]; - configureFlags = "--with-gssapi-impl=mit"; + configureFlags = [ "--with-gssapi-impl=mit" ]; doCheck = true; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 705fb816b2e5e..b8ad48326b2bf 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -36,9 +36,9 @@ let sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux ''; - configureFlags = "--disable-debug" + - stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath" + - stdenv.lib.optionalString (buildPlatform != hostPlatform) " --with-cross-build=${nativeBuildRoot}"; + configureFlags = [ "--disable-debug" ] + ++ stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) "--enable-rpath" + ++ stdenv.lib.optional (buildPlatform != hostPlatform) "--with-cross-build=${nativeBuildRoot}"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 624e401b62f74..2b95742c44c06 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -7,10 +7,11 @@ stdenv.mkDerivation { sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; - configureFlags = " - --disable-shm - --x-includes=${libX11.dev}/include - --x-libraries=${libX11.out}/lib"; + configureFlags = [ + "--disable-shm" + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + ]; buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index bc18a13884b51..de4848c7dda40 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ libjpeg ]; - configureFlags = "--enable-shared"; + configureFlags = [ "--enable-shared" ]; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index e9ba4ae5ac212..c815262ac0e7b 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib zlib libpng cmake gnumake3 ]; - configureFlags = "-v"; + configureFlags = [ "-v" ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index dea102774d090..c1e9ba7d1c731 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cat configure.in | ${bsdbuild}/bin/mkconfigure > configure ''; - configureFlags = "--with-agar=${libagar}"; + configureFlags = [ "--with-agar=${libagar}" ]; buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 0d1772d0c549a..8addb6128f0cf 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux libcap ++ lib.optional withAlsa alsaLib; - configureFlags = "--disable-oss"; + configureFlags = [ "--disable-oss" ]; patchFlags = "-p0"; patches = stdenv.lib.optional stdenv.isDarwin diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 9ab42c7fd1dd9..d62d1a8026456 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ boost libxml2 curl ]; - configureFlags = "--without-man --with-boost=${boost.dev} --disable-werror --disable-tests"; + configureFlags = [ "--without-man" "--with-boost=${boost.dev}" "--disable-werror" "--disable-tests" ]; # Cppcheck cannot find all the include files (use --check-config for details) doCheck = false; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 88b15b58c43d0..e3f3604f94e3d 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -27,10 +27,12 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; - configureFlags = "--disable-ltdl-install " - + "--with-ltdl-include=${libtool}/include " - + "--with-ltdl-lib=${libtool.lib}/lib " - + "--enable-xpdf"; + configureFlags = [ + "--disable-ltdl-install" + "--with-ltdl-include=${libtool}/include" + "--with-ltdl-lib=${libtool.lib}/lib" + "--enable-xpdf" + ]; # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 7e5ac2a2297ca..af8297e985494 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; buildInputs = [ libmad libid3tag ]; - configureFlags = "--disable-pcre"; + configureFlags = [ "--disable-pcre" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/mp3splt/; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 01a828f95da5e..0153ff8327b67 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { passthru = { inherit zlib; }; - configureFlags = "--enable-static"; + configureFlags = [ "--enable-static" ]; postInstall = ''mv "$out/bin" "$dev/bin"''; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 5c4699d262680..5afed2b2a2f50 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = "--enable-shared"; + configureFlags = [ "--enable-shared" ]; meta = { description = "A C++ library to access PostgreSQL databases"; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index b75baf149e1aa..8e7b539527e15 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 sqlite zlib proj geos libiconv ]; - configureFlags = "--disable-freexl"; + configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 6050a7080df9b..695effe2ea92e 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"; }; - buildInputs = [boost icu libpng librevenge zlib cppunit]; - nativeBuildInputs = [doxygen pkgconfig]; - configureFlags = " --disable-werror "; + buildInputs = [ boost icu libpng librevenge zlib cppunit ]; + nativeBuildInputs = [ doxygen pkgconfig ]; + configureFlags = [ "--disable-werror" ]; meta = { inherit version; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index e014e38c3f97a..aecd75656dae6 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ]; - configureFlags = "--with-ssl=openssl"; + configureFlags = [ "--with-ssl=openssl" ]; propagatedBuildInputs = [ openssl libidn glib zlib ]; diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index 3696578b8e040..904cdc6a3daa9 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -10,11 +10,18 @@ stdenv.mkDerivation rec { buildInputs = [ octave ]; - configureFlags = "--with-cxx --enable-shared --with-pic --without-guile --without-python - --without-matlab " + - stdenv.lib.optionalString (octave != null) ("--with-octave " + - "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " + - "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct "); + configureFlags = [ + "--with-cxx" + "--enable-shared" + "--with-pic" + "--without-guile" + "--without-python" + "--without-matlab" + ] ++ stdenv.lib.optionals (octave != null) [ + "--with-octave" + "M_INSTALL_DIR=$(out)/${octave.sitePath}/m" + "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct" + ]; meta = { homepage = http://ab-initio.mit.edu/nlopt/; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index fb36839fe2337..44c8f51e856a4 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; - configureFlags = "--without-gobject CFLAGS=--std=gnu99"; + configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; # Remove this patch after version 016 patches = [ ./libnl-fix.patch ]; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 1aa0f26845710..2122a7b23f1b8 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags="$cmakeFlags -DPACKAGE_ARCHITECTURE=$(uname -m)"; ''; - configureFlags = "--disable-more-warnings"; + configureFlags = [ "--disable-more-warnings" ]; meta = with stdenv.lib; { description = "Openwsman server implementation and client API with bindings"; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 484e585687210..4446226fedef7 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; + configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 5a4306a63a783..1c777e849a469 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat zlib geos libspatialite ]; - configureFlags = "--disable-freexl"; + configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 2144a7f789356..48548bd726521 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 lzma curl ]; - configureFlags = "--enable-libcurl"; # optional but strongly recommended + configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended installFlags = "prefix=$(out)"; diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index fe90fa2e171d1..33e8baada8346 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "liblbfgs-1.10"; - configureFlags = "--enable-sse2"; + configureFlags = [ "--enable-sse2" ]; src = fetchurl { url = https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz; sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21"; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 1b5564dc15900..acf10cc497c8d 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; }; - configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib"; + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ]; postUnpack = ''sourceRoot="$sourceRoot/unix"''; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 9070423d8c76d..4ea7de0b1a38f 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ]; - configureFlags = "--disable-freexl"; + configureFlags = [ "--disable-freexl" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 0c3bb3b130647..afb168d5aa2ab 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = "--without-conf --enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable"; + configureFlags = [ "--without-conf" "--enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable" ]; meta = with stdenv.lib; { description = "A software framework that allows research manipulation of Biblical texts"; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index cb200b82e2076..dee441a0c2f67 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # TODO: package boost-test, so we can run the test suite. (Currently it fails # to find libboost_unit_test_framework.a.) - configureFlags = "--enable-tests=no"; + configureFlags = [ "--enable-tests=no" ]; doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 2fa6710c4faff..c2ab61c6bd17f 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { yasm vapoursynth fftwFloat ]; - configureFlags = "--libdir=$(out)/lib/vapoursynth"; + configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ]; meta = with stdenv.lib; { description = "A set of filters for motion estimation and compensation"; diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 3555a92322855..750a786c3fcac 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; - configureFlags = "--with-scanner --disable-documentation"; + configureFlags = [ "--with-scanner" "--disable-documentation" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix index 0826b83ed1992..4d569608091d9 100644 --- a/pkgs/development/misc/avr/binutils/default.nix +++ b/pkgs/development/misc/avr/binutils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; - configureFlags = "--target=avr --enable-languages=c,c++"; + configureFlags = [ "--target=avr" "--enable-languages=c,c++" ]; meta = with stdenv.lib; { description = "the GNU Binutils for AVR microcontrollers"; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 72c426ce0372d..445ff3ecb18a6 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { disableIda = "--disable-ida --disable-fsi-benchmark"; - configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; + configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm_38}/bin/llvm-config" ]; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index a7dc5ef0191e4..8c9aa46d9a00e 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ounit ]; - configureFlags = "--enable-tests"; + configureFlags = [ "--enable-tests" ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 5dc303b59f48b..55a4a02f7ffca 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; - configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; + configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = "world"; preInstall = '' diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index ff42af0c0e409..6b01929db7686 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; - configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; + configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = "world"; preInstall = '' diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index efbb12304970f..474f69ba918ee 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ] ++ (param.buildInputs or []); - configureFlags = "--root $(out) --prefix /"; + configureFlags = [ "--root $(out) --prefix /" ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 20100a9b2eb5d..dfe7ec84d6368 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ounit ]; - configureFlags = "--enable-tests"; + configureFlags = [ "--enable-tests" ]; doCheck = true; checkPhase = "ocaml setup.ml -test"; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 796fc992a7dc5..56e8f1fa5eb62 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ./pygobject-2.28.6-gio-types-2.32.patch ]; - configureFlags = "--disable-introspection"; + configureFlags = [ "--disable-introspection" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib ]; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 7e8a41590724f..9b16d55d41389 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = [ libxslt ]; - configureFlags = "--disable-scrollkeeper"; + configureFlags = [ "--disable-scrollkeeper" ]; preBuild = '' substituteInPlace xml2po/xml2po/Makefile --replace '-e "s+^#!.*python.*+#!$(PYTHON)+"' '-e "s\"^#!.*python.*\"#!$(PYTHON)\""' diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 0b1bbf5f9e4db..52d3adf3bec6b 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1byk29rcpyygrnr03h5j3y8j0aqxldd9dr5ihi9q982sy28x12a8"; }; - configureFlags = "--with-ncurses=${ncurses.dev}"; + configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; buildInputs = [ ncurses ]; nativeBuildInputs = stdenv.lib.optional emacsSupport emacs; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 9375dfb20cd88..7238bcdeb6b85 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; buildInputs = [motif ncurses libX11 libXt]; - configureFlags = "--with-x"; + configureFlags = [ "--with-x" ]; patches = [ ./gcc44.patch ]; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 9cd6e2c5e1acb..7e92df1a99788 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { doCheck = false; - configureFlags = "--with-syscmd-shell=${stdenv.shell}"; + configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; # Upstream is aware of it; it may be in the next release. patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 6dbaca26c8181..acf1988c947d3 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ pcre ]; - configureFlags = "--without-tcl"; + configureFlags = [ "--without-tcl" ]; postPatch = '' # Disable ccache documentation as it need yodl diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 48a2e7bd2cb16..077d037aa97fb 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ pcre ]; - configureFlags = "--without-tcl"; + configureFlags = [ "--without-tcl" ]; postPatch = '' # Disable ccache documentation as it need yodl diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index e10fd25d046f0..cfd1c7728cb26 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # 'make check' uses boost and tcl buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; - configureFlags = "--disable-ccache"; + configureFlags = [ "--disable-ccache" ]; meta = { description = "Interface compiler that connects C/C++ code to higher-level languages"; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 2fe76649d5520..17469777ea415 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0a03a2l3ji6h48n106d4w55l8v6lni1axniafnvvv5c5n3nz5bgd"; }; - configureFlags = "--disable-tools"; + configureFlags = [ "--disable-tools" ]; patches = [ # Arch Linux patch set. diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index 6ede118526d82..610fba5057d0a 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; # The build fails, unless we disable the default -Wall -Werror - configureFlags = "--disable-warn"; + configureFlags = [ "--disable-warn" ]; buildInputs = [ SDL libGLU_combined zlib libpng libvorbis libmikmod SDL_sound ]; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 45067d963975d..6f0afc359ab44 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { patches = [ ./typespeed-config-in-home.patch ]; - configureFlags = "--datadir=\${out}/share/"; - makeFlags = ["CC=cc"]; + configureFlags = [ "--datadir=\${out}/share/" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with stdenv.lib; { description = "A curses based typing game"; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 5d54d647f2b12..a21584afa4c29 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ udev ncurses bluez ]; - configureFlags = "--with-doxygen=no"; + configureFlags = [ "--with-doxygen=no" ]; meta = { homepage = http://dvdhrm.github.io/xwiimote; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 9467345db1c27..9e662c42304bb 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -13,7 +13,15 @@ stdenv.mkDerivation rec{ buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ]; - configureFlags = "--target=default --with-video=sdl --with-sound=sdl --with-readline --with-opengl --with-x --enable-riodevice"; + configureFlags = [ + "--target=default" + "--with-video=sdl" + "--with-sound=sdl" + "--with-readline" + "--with-opengl" + "--with-x" + "--enable-riodevice" + ]; preConfigure = "cd src"; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index ae8fbe9e1f5e0..7cf4faf55cd72 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU_combined pkgconfig gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; - configureFlags = "--enable-fullscreen --enable-gnomeui"; + configureFlags = [ "--enable-fullscreen --enable-gnomeui" ]; desktopItem = makeDesktopItem { name = "vice"; diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 0e5e87245f32d..ae89bbd53cc66 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./eintr.patch ]; - configureFlags = "VLOCK_GROUP=root ROOT_GROUP=root"; + configureFlags = [ "VLOCK_GROUP=root" "ROOT_GROUP=root" ]; buildInputs = [ pam ]; diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index a13e178e4183e..431353e234efd 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib ncurses libsamplerate ]; nativeBuildInputs = [ gettext ]; - configureFlags = "--disable-xmlto"; + configureFlags = [ "--disable-xmlto" ]; installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 376c42a8f9b8b..86d9aeebf1b97 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext ]; buildInputs = [ alsaLib ncurses libsamplerate fftw ]; - configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; + configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 8d18d5980207c..c6792ea17fb54 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -12,7 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ flex perl ]; - configureFlags = "--without-distro --without-pacemaker --localstatedir=/var --sysconfdir=/etc"; + configureFlags = [ + "--without-distro" + "--without-pacemaker" + "--localstatedir=/var" + "--sysconfdir=/etc" + ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index c1d324de7cffe..2b296ebabcadb 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ./configure"; - configureFlags = "--datadir=$(prefix)/data"; + configureFlags = [ "--datadir=$(prefix)/data" ]; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index a5577b97b8704..b314e8db83791 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; - configureFlags = "--sysconfdir=/etc"; + configureFlags = [ "--sysconfdir=/etc" ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 1a7a31d978af9..ea34075210df0 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { buildInputs = [ intltool utillinux ]; - configureFlags = "" - + " --with-media-dir=${mediaDir}" - + " --with-lock-dir=${lockDir}" - + " --with-whitelist=${whiteList}" - + " --with-mount-prog=${utillinux}/bin/mount" - + " --with-umount-prog=${utillinux}/bin/umount" - + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"; + configureFlags = [ + "--with-media-dir=${mediaDir}" + "--with-lock-dir=${lockDir}" + "--with-whitelist=${whiteList}" + "--with-mount-prog=${utillinux}/bin/mount" + "--with-umount-prog=${utillinux}/bin/umount" + "--with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g" + ]; postConfigure = '' # etc/Mafile.am is hardcoded and it does not respect the --prefix option. diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 199523db42817..bdc6a63f0697f 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - configureFlags = "--localstatedir=/var --enable-lvm2"; + configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index 71b47c5a50f9b..3738760bb2904 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }); in map mkStatic [ zlib bzip2 lzma libgcrypt ]; - configureFlags = "--disable-shared"; + configureFlags = [ "--disable-shared" ]; dontDisableStatic = true; diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index d35a9a683031c..3c04a678def5b 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool ]; - # configureFlags = "--datadir=/var/run/current-system/share/dictd"; + # configureFlags = [ "--datadir=/var/run/current-system/share/dictd" ]; meta = with stdenv.lib; { description = "Dict protocol server and client"; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 58ae8f85b81ff..e569ae8f8706c 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; - configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; + configureFlags = [ + "--with-apxs=${apacheHttpd.dev}/bin/apxs" + "--with-java-home=${jdk}" + ]; setSourceRoot = '' sourceRoot=$(echo */native) diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index a0a1addeeebf9..5195f3145f989 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent file qrencode miniupnpc ]; # SSL requires libevent at 2.1 with ssl support - configureFlags = "--disable-ssl"; + configureFlags = [ "--disable-ssl" ]; meta = { description = "Pretty small HTTP server - a command-line tool to share files"; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 5f92fbf2c03f6..827f6122b5732 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cd $name ''; - configureFlags = "--with-extrainclude=${pam}/include/security"; + configureFlags = [ "--with-extrainclude=${pam}/include/security" ]; buildInputs = [ erlang pam perl ]; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 8ff20869b94ef..6e7c859ae8cbf 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -13,9 +13,13 @@ stdenv.mkDerivation rec { patches = [ ./fix-var-prefix.patch ]; - configureFlags = "--without-permcheck --with-cgi-ext=.cgi --with-var-prefix=/var/lib/mailman"; + configureFlags = [ + "--without-permcheck" + "--with-cgi-ext=.cgi" + "--with-var-prefix=/var/lib/mailman" + ]; - installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. + installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. makeFlags = [ "DIRSETGID=:" ]; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 8ccd783b6ad80..c97d8e4ccf388 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison ]; - configureFlags = "--with-mta=${sendmailPath}"; + configureFlags = [ "--with-mta=${sendmailPath}" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 9f1a2baeb9ac8..ce660fa6e88be 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -77,7 +77,7 @@ in inherit src preConfigure; - configureFlags = "--enable-agent"; + configureFlags = [ "--enable-agent" ]; meta = with stdenv.lib; { inherit branch; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index bf3849e6524b0..ac0e6bb81f8b9 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -89,7 +89,7 @@ in inherit src preConfigure; - configureFlags = "--enable-agent"; + configureFlags = [ "--enable-agent" ]; meta = with stdenv.lib; { inherit branch; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index be52698ed8398..4b6bd5e0b2508 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -27,7 +27,12 @@ in inherit src preConfigure; - configureFlags = "--enable-agent --enable-server --with-pgsql --with-libcurl"; + configureFlags = [ + "--enable-agent" + "--enable-server" + "--with-pgsql" + "--with-libcurl" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ postgresql curl openssl zlib ]; @@ -56,7 +61,7 @@ in inherit src preConfigure; - configureFlags = "--enable-agent"; + configureFlags = [ "--enable-agent" ]; meta = with stdenv.lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 6d2bb9b9e9498..955547289bc6a 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "096w4gxj08m3vwmyv4sxpmbl8dn6mzqfmrhc32jgyca6qzlrdin8"; }; - configureFlags = "--enable-runas-user=nobody"; + configureFlags = [ "--enable-runas-user=nobody" ]; prePatch = '' substituteInPlace Makefile.in --replace 02770 0770 diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix index 684817d309baa..2364e0913bc82 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiodbc postgresql openssl ]; - configureFlags = "--with-iodbc=${libiodbc}"; + configureFlags = [ "--with-iodbc=${libiodbc}" ]; meta = with stdenv.lib; { homepage = http://psqlodbc.projects.postgresql.org/; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index b0b8f926d9ec6..eda1f060df279 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { CPP = "${stdenv.cc}/bin/gcc -E"; - configureFlags = " - --enable-shared --disable-all-vads --with-readline=${readline.dev} - --disable-hslookup --disable-wbxml2 --without-iodbc - --enable-openssl=${openssl.dev} - "; + configureFlags = [ + "--enable-shared" "--disable-all-vads" "--with-readline=${readline.dev}" + "--disable-hslookup" "--disable-wbxml2" "--without-iodbc" + "--enable-openssl=${openssl.dev}" + ]; postInstall = '' echo Moving documentation diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index bf2a51f65963e..536e96354d92c 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { CPP = "${stdenv.cc}/bin/gcc -E"; - configureFlags = " - --enable-shared --disable-all-vads --with-readline=${readline.dev} - --disable-hslookup --disable-wbxml2 --without-iodbc - --enable-openssl=${openssl.dev} - "; + configureFlags = [ + "--enable-shared" "--disable-all-vads" "--with-readline=${readline.dev}" + "--disable-hslookup" "--disable-wbxml2" "--without-iodbc" + "--enable-openssl=${openssl.dev}" + ]; postInstall='' echo Moving documentation diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index cc28dc73ca87e..6f94929ffd674 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -171,7 +171,7 @@ let sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -183,7 +183,7 @@ let sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -195,7 +195,7 @@ let sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -207,7 +207,7 @@ let sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -219,7 +219,7 @@ let sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -243,7 +243,7 @@ let sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -255,7 +255,7 @@ let sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -267,7 +267,7 @@ let sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -279,7 +279,7 @@ let sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -291,7 +291,7 @@ let sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -303,7 +303,7 @@ let sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -315,7 +315,7 @@ let sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -327,7 +327,7 @@ let sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -339,7 +339,7 @@ let sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -351,7 +351,7 @@ let sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -363,7 +363,7 @@ let sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -375,7 +375,7 @@ let sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -387,7 +387,7 @@ let sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -399,7 +399,7 @@ let sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -411,7 +411,7 @@ let sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -423,7 +423,7 @@ let sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -435,7 +435,7 @@ let sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -447,7 +447,7 @@ let sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -459,7 +459,7 @@ let sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -471,7 +471,7 @@ let sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -483,7 +483,7 @@ let sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; @@ -495,7 +495,7 @@ let sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -507,7 +507,7 @@ let sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -519,7 +519,7 @@ let sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; @@ -531,7 +531,7 @@ let sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -543,7 +543,7 @@ let sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -567,7 +567,7 @@ let sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -591,7 +591,7 @@ let sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit bdftopcf mkfontdir ;}; @@ -603,7 +603,7 @@ let sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit mkfontdir mkfontscale ;}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index dfde730fbea8f..37daa0dc9bc45 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -178,7 +178,7 @@ while (<>) { } if ($isFont) { - $extraAttrs{$pkg} = " configureFlags = \"--with-fontrootdir=\$(out)/lib/X11/fonts\"; "; + $extraAttrs{$pkg} = " configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ]; "; } sub process { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 2438c49d9cb9b..0023c2c070a53 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -77,7 +77,7 @@ in libxcb = attrs : attrs // { nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ]; - configureFlags = "--enable-xkb --enable-xinput"; + configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; }; @@ -147,7 +147,7 @@ in # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 # Once the bug is fixed upstream, this can be removed. luit = attrs: attrs // { - configureFlags = "--disable-selective-werror"; + configureFlags = [ "--disable-selective-werror" ]; }; compositeproto = attrs: attrs // { @@ -408,7 +408,7 @@ in }; xkbcomp = attrs: attrs // { - configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb"; + configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ]; }; xkeyboardconfig = attrs: attrs // { @@ -597,7 +597,7 @@ in xcursorthemes = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; - configureFlags = "--with-cursordir=$(out)/share/icons"; + configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; }; xinit = attrs: attrs // { @@ -627,7 +627,7 @@ in }; buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman]; nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros]; - configureFlags = "--with-default-dri=3 --enable-tools"; + configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; @@ -672,7 +672,7 @@ in }; xrdb = attrs: attrs // { - configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp"; + configureFlags = [ "--with-cpp=${args.mcpp}/bin/mcpp" ]; }; sessreg = attrs: attrs // { diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 8781c2d2cada4..a2e962d7f8559 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; - configureFlags = "--with-ssl-headers=${openssl.dev}/include/openssl"; + configureFlags = [ "--with-ssl-headers=${openssl.dev}/include/openssl" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [bzip2 zlib newt newt openssl slang diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 64934ccb469b0..38933c524cc0c 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./isdir.patch ./fix-sysconfdir.patch ]; - configureFlags = "--sysconfdir=/etc"; + configureFlags = [ "--sysconfdir=/etc" ]; makeFlags = ["sbindir=$(out)/sbin" "ssbindir=$(out)/sbin"]; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 8bc33fb1b0a44..b8f32c33a5309 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXt libXaw libXres utilmacros ]; - configureFlags = "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres"; + configureFlags = [ "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index 071c8f360792b..0ed1855a338ce 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gtk2 ]; - configureFlags = "--with-all-plugins"; + configureFlags = [ "--with-all-plugins" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 780e09ee91cf2..0d1890bb6703f 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { make -C libplot xmi.h ''; - configureFlags = "--enable-libplotter"; # required for pstoedit + configureFlags = [ "--enable-libplotter" ]; # required for pstoedit hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index b930da02acc97..bb179e18e0783 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -17,5 +17,5 @@ stdenv.mkDerivation rec { sha256 = "0xv9ymivp8fnyc5xcyh1vamxnx90bzw66wlld813fvm6q2gsiknk"; }; - configureFlags = "--without-initdir --disable-lynx"; + configureFlags = [ "--without-initdir" "--disable-lynx" ]; } diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 61ddec3caaa2d..3471016db5b98 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { -e "s|/bin/rm|rm|" ''; - configureFlags = "--with-slang=${slang.dev}"; + configureFlags = [ "--with-slang=${slang.dev}" ]; buildInputs = [ slang ncurses ]; diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index 766ae4116061d..dccab1796fbc9 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { done ''; - configureFlags = "--with-perl=${perl}/bin/perl"; + configureFlags = [ "--with-perl=${perl}/bin/perl" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index 6bc96a5b8c72e..75a05108b8bf3 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = "--with-ssl"; + configureFlags = [ "--with-ssl" ]; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix index f769a3fcffacc..2ed5346b55192 100644 --- a/pkgs/tools/networking/infiniband-diags/default.nix +++ b/pkgs/tools/networking/infiniband-diags/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - configureFlags = "--with-perl-installdir=\${out}/lib/perl5/site_perl --sbindir=\${out}/bin"; + configureFlags = [ "--with-perl-installdir=\${out}/lib/perl5/site_perl" "--sbindir=\${out}/bin" ]; postInstall = '' rmdir $out/var/run $out/var diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 6cbee7d2a8514..ed48feabb85aa 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */src) ''; - configureFlags = "--sysconfdir=${confdir}"; + configureFlags = [ "--sysconfdir=${confdir}" ]; installPhase = '' mkdir -p $out/{bin,etc} diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 031f32b536262..6a8306cc4b8d9 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation { # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858781 patches = [ ./ssmtp_support_AuthPassFile_parameter.patch ]; - configureFlags = "--sysconfdir=/etc ${if tlsSupport then "--enable-ssl" else ""}"; + configureFlags = [ + "--sysconfdir=/etc" + (stdenv.lib.enableFeature tlsSupport "ssl") + ]; postConfigure = '' diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index f6c88bb66b7c8..7a4adc14c2dff 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { LDFLAGS = "-levent"; - configureFlags = "--with-libevent"; + configureFlags = [ "--with-libevent" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 5d31d35bd634d..67a95f32b619c 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, libpng, gd, geoip, db}: +{ stdenv, fetchurl, zlib, libpng, gd, geoip, db }: stdenv.mkDerivation { name = "webalizer-2.23-05"; @@ -16,7 +16,12 @@ stdenv.mkDerivation { buildInputs = [zlib libpng gd geoip db]; - configureFlags = "--enable-dns --enable-geoip --disable-static --enable-shared"; + configureFlags = [ + "--enable-dns" + "--enable-geoip" + "--disable-static" + "--enable-shared" + ]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 688521e1401a4..2b4173a51af18 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - configureFlags = "--sysconfdir=/etc --localstatedir=/var"; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; installFlags = "sysconfdir=$(out)/etc localstatedir=$(TMPDIR)"; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 166f20dd7d6db..e273b2c190915 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { preConfigure = "./bootstrap.sh"; - configureFlags = "" - + stdenv.lib.optionalString withCrypto "--with-crypto " - + stdenv.lib.optionalString enableMagic "--enable-magic " - + stdenv.lib.optionalString enableCuckoo "--enable-cuckoo " - ; + configureFlags = [ + (stdenv.lib.withFeature withCrypto "crypto") + (stdenv.lib.enableFeature enableMagic "magic") + (stdenv.lib.enableFeature enableCuckoo "cuckoo") + ]; meta = with stdenv.lib; { description = "The pattern matching swiss knife for malware researchers"; diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 2a06b25b11daa..8a8eb3117f033 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = "--disable-wordview"; + configureFlags = [ "--disable-wordview" ]; meta = with stdenv.lib; { description = "MS-Word/Excel/PowerPoint to text converter"; diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 2177937221a1a..e6966834feb53 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { configureScript = "./autogen.sh"; - configureFlags = "--disable-pangoxsl --disable-gp"; + configureFlags = [ + "--disable-pangoxsl" + "--disable-gp" + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0057353c3e0b3..8d4f99d5ce19b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -109,7 +109,7 @@ let imagick = buildPecl { name = "imagick-3.4.3"; sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z"; - configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; + configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.pcre ]; }; @@ -120,7 +120,7 @@ let sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic"; - configureFlags = "--with-zlib-dir=${pkgs.zlib.dev}"; + configureFlags = [ "--with-zlib-dir=${pkgs.zlib.dev}" ]; makeFlags = [ "CFLAGS=-fgnu89-inline" ]; }; |