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 /pkgs/applications/misc | |
parent | 85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e (diff) | |
download | nixlib-db965063b346a33cc3f6363a40cbde2658d2cd23.tar nixlib-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.gz nixlib-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.bz2 nixlib-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.lz nixlib-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.xz nixlib-db965063b346a33cc3f6363a40cbde2658d2cd23.tar.zst nixlib-db965063b346a33cc3f6363a40cbde2658d2cd23.zip |
treewide: Make configureFlags lists
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/cgminer/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/fetchmail/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/font-manager/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/gksu/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/jigdo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/notify-osd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/taskjuggler/2.x/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/misc/wordnet/default.nix | 6 |
8 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index acd38d74dca4..ee3e2a955d32 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 5cd8f572ad48..7aee6cb70816 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 be853e4213bc..1fad5333a144 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 6adc805b7284..712c2081f102 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 d8b1253ac276..3561fcde839d 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 8e8126192dda..f602ce9db66a 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 2b0573f2d2d1..6b38c3d59c29 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 71d95e138927..a2e3fa13fc6a 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}" |