summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-11-05 02:10:31 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-12-30 13:22:43 +0100
commit2157dcd141a5df499698ffb9b1d901192f089bdc (patch)
treeaff6dd99868e7b461d5b5f87f347c079960862ed
parent133103d7094c148bdc9152562b16c8872c44f345 (diff)
treewide: installFlags is a list
-rw-r--r--pkgs/applications/audio/avldrums-lv2/default.nix2
-rw-r--r--pkgs/applications/audio/cd-discid/default.nix2
-rw-r--r--pkgs/applications/audio/eq10q/default.nix4
-rw-r--r--pkgs/applications/misc/taskjuggler/2.x/default.nix5
-rw-r--r--pkgs/applications/networking/instant-messengers/swift-im/default.nix6
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix2
-rw-r--r--pkgs/development/beam-modules/webdriver/default.nix2
-rw-r--r--pkgs/development/compilers/rgbds/default.nix2
-rw-r--r--pkgs/development/coq-modules/Cheerios/default.nix2
-rw-r--r--pkgs/development/coq-modules/InfSeqExt/default.nix2
-rw-r--r--pkgs/development/coq-modules/StructTact/default.nix2
-rw-r--r--pkgs/development/coq-modules/Verdi/default.nix2
-rw-r--r--pkgs/development/coq-modules/autosubst/default.nix2
-rw-r--r--pkgs/development/coq-modules/bignums/default.nix2
-rw-r--r--pkgs/development/coq-modules/coq-elpi/default.nix2
-rw-r--r--pkgs/development/coq-modules/coq-ext-lib/default.nix2
-rw-r--r--pkgs/development/coq-modules/coqprime/default.nix2
-rw-r--r--pkgs/development/coq-modules/corn/default.nix2
-rw-r--r--pkgs/development/coq-modules/dpdgraph/default.nix8
-rw-r--r--pkgs/development/coq-modules/equations/default.nix2
-rw-r--r--pkgs/development/coq-modules/heq/default.nix2
-rw-r--r--pkgs/development/coq-modules/ltac2/default.nix2
-rw-r--r--pkgs/development/coq-modules/math-classes/default.nix2
-rw-r--r--pkgs/development/coq-modules/mathcomp/extra.nix4
-rw-r--r--pkgs/development/coq-modules/paramcoq/default.nix2
-rw-r--r--pkgs/development/coq-modules/tlc/default.nix2
-rw-r--r--pkgs/development/libraries/farbfeld/default.nix2
-rw-r--r--pkgs/development/libraries/fontconfig/2.10.nix2
-rw-r--r--pkgs/development/libraries/libguestfs/default.nix2
-rw-r--r--pkgs/development/libraries/libosmpbf/default.nix2
-rw-r--r--pkgs/development/libraries/libspotify/default.nix6
-rw-r--r--pkgs/development/libraries/science/biology/htslib/default.nix2
-rw-r--r--pkgs/development/libraries/shhmsg/default.nix2
-rw-r--r--pkgs/development/libraries/shhopt/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/ocplib-simplex/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/pprint/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/psmt2-frontend/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/twt/default.nix2
-rw-r--r--pkgs/development/tools/imatix_gsl/default.nix2
-rw-r--r--pkgs/development/tools/literate-programming/noweb/default.nix2
-rw-r--r--pkgs/development/tools/misc/trv/default.nix2
-rw-r--r--pkgs/games/angband/default.nix2
-rw-r--r--pkgs/misc/drivers/foomatic-filters/default.nix9
-rw-r--r--pkgs/misc/screensavers/slock/default.nix2
-rw-r--r--pkgs/os-specific/linux/alsa-oss/default.nix2
-rw-r--r--pkgs/os-specific/linux/alsa-utils/default.nix2
-rw-r--r--pkgs/os-specific/linux/consoletools/default.nix2
-rw-r--r--pkgs/os-specific/linux/kernel/perf.nix2
-rw-r--r--pkgs/os-specific/linux/libcap/default.nix2
-rw-r--r--pkgs/os-specific/linux/open-isns/default.nix4
-rw-r--r--pkgs/os-specific/linux/paxtest/default.nix2
-rw-r--r--pkgs/os-specific/linux/sysklogd/default.nix2
-rw-r--r--pkgs/servers/amqp/rabbitmq-server/default.nix4
-rw-r--r--pkgs/servers/http/apache-modules/mod_python/default.nix3
-rw-r--r--pkgs/shells/zsh/zsh-syntax-highlighting/default.nix2
-rw-r--r--pkgs/tools/archivers/afio/default.nix2
-rw-r--r--pkgs/tools/compression/pbzip2/default.nix2
-rw-r--r--pkgs/tools/filesystems/nixpart/0.4/lvm2.nix2
-rw-r--r--pkgs/tools/filesystems/sasquatch/default.nix2
-rw-r--r--pkgs/tools/filesystems/squashfs/default.nix2
-rw-r--r--pkgs/tools/misc/automirror/default.nix2
-rw-r--r--pkgs/tools/networking/iodine/default.nix2
-rw-r--r--pkgs/tools/networking/openresolv/default.nix2
-rw-r--r--pkgs/tools/networking/ssmtp/default.nix2
-rw-r--r--pkgs/tools/security/rarcrack/default.nix4
-rw-r--r--pkgs/tools/security/super/default.nix2
-rw-r--r--pkgs/tools/security/tboot/default.nix2
-rw-r--r--pkgs/tools/system/setserial/default.nix2
-rw-r--r--pkgs/tools/text/untex/default.nix4
70 files changed, 86 insertions, 91 deletions
diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
index eeb0f67d1937..d71718c32a82 100644
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
- installFlags = "PREFIX=$(out)";
+ installFlags = [ "PREFIX=$(out)" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 76f76c1e750d..864e04d88f3c 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
};
- installFlags = "PREFIX=$(out) INSTALL=install";
+ installFlags = [ "PREFIX=$(out)" "INSTALL=install" ];
buildInputs = []
++ stdenv.lib.optional stdenv.isDarwin IOKit;
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 0308fad831d0..b4ad15053204 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
})
];
- installFlags = ''
- DESTDIR=$(out)
- '';
+ installFlags = [ "DESTDIR=$(out)" ];
fixupPhase = ''
cp -r $out/var/empty/local/lib $out
diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
index 6b38c3d59c29..a0dc7b7c71e3 100644
--- a/pkgs/applications/misc/taskjuggler/2.x/default.nix
+++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix
@@ -56,9 +56,8 @@ stdenv.mkDerivation rec {
cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/
'';
- installFlags =
- # kde_locale is not defined when installing without kde.
- "kde_locale=\${out}/share/locale";
+ # kde_locale is not defined when installing without kde.
+ installFlags = [ "kde_locale=\${out}/share/locale" ];
meta = {
homepage = http://www.taskjuggler.org;
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index db1d0a54dce0..d1d69b3d837b 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -31,10 +31,8 @@ stdenv.mkDerivation rec {
"-fpermissive"
];
- preInstall = ''
- installTargets="$out"
- installFlags+=" SWIFT_INSTALLDIR=$out"
- '';
+ installTargets = [ (placeholder "out") ];
+ installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ];
meta = with stdenv.lib; {
homepage = https://swift.im/;
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 6df3a97dbbb2..28e63c4f1662 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
doCheck = false;
- installFlags = "HOME=\${out} install-doc";
+ installFlags = [ "HOME=\${out}" "install-doc" ];
postInstall = ''
wrapProgram $out/bin/git-remote-hg \
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 312879a49e86..7c46d26bf5b3 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation {
# WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead.
# We need many of these files during the installCheckPhase.
- installFlags = "NO_INSTALL_HARDLINKS=1";
+ installFlags = [ "NO_INSTALL_HARDLINKS=1" ];
preInstall = (stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/bin
diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix
index b6695029f34c..d772ad7a3c71 100644
--- a/pkgs/development/beam-modules/webdriver/default.nix
+++ b/pkgs/development/beam-modules/webdriver/default.nix
@@ -23,7 +23,7 @@ let
buildInputs = [ erlang ];
- installFlags = "PREFIX=$(out)/lib/erlang/lib";
+ installFlags = [ "PREFIX=$(out)/lib/erlang/lib" ];
meta = {
description = "WebDriver implementation in Erlang";
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index 99519c53fcda..bf2594b9bf4c 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv";
};
nativeBuildInputs = [ bison flex pkg-config libpng ];
- installFlags = "PREFIX=\${out}";
+ installFlags = [ "PREFIX=\${out}" ];
meta = with stdenv.lib; {
homepage = https://rednex.github.io/rgbds/;
diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix
index 4e75b9407dee..14048d1b0d82 100644
--- a/pkgs/development/coq-modules/Cheerios/default.nix
+++ b/pkgs/development/coq-modules/Cheerios/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
preConfigure = "patchShebangs ./configure";
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix
index 5df96519e7ff..ced2b7ce3dbf 100644
--- a/pkgs/development/coq-modules/InfSeqExt/default.nix
+++ b/pkgs/development/coq-modules/InfSeqExt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
preConfigure = "patchShebangs ./configure";
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix
index 2e4d12478b79..798aaabe6773 100644
--- a/pkgs/development/coq-modules/StructTact/default.nix
+++ b/pkgs/development/coq-modules/StructTact/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
preConfigure = "patchShebangs ./configure";
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix
index d2e9660a630e..3cf3a4e8d4bd 100644
--- a/pkgs/development/coq-modules/Verdi/default.nix
+++ b/pkgs/development/coq-modules/Verdi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
preConfigure = "patchShebangs ./configure";
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index bffa5172b0e4..ee08af40c51e 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [./0001-changes-to-work-with-Coq-8.6.patch];
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = with stdenv.lib; {
homepage = https://www.ps.uni-saarland.de/autosubst/;
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index fb45e591ec1a..0d6d7f172161 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = with stdenv.lib; {
license = licenses.lgpl2;
diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index defe52987aa0..56aa005c4a92 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which ];
buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]);
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = {
description = "Coq plugin embedding ELPI.";
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 588172aea61c..977039223959 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = with stdenv.lib; {
homepage = https://github.com/coq-ext-lib/coq-ext-lib;
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
index 6228bd4be9d0..aaf867baf258 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ bignums ];
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = with stdenv.lib; {
description = "Library to certify primality using Pocklington certificate and Elliptic Curve Certificate";
diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix
index e5fa11c5cad4..97bb884c92e2 100644
--- a/pkgs/development/coq-modules/corn/default.nix
+++ b/pkgs/development/coq-modules/corn/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = {
homepage = http://c-corn.github.io/;
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 401cb299497b..49288d3cb327 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -41,10 +41,10 @@ stdenv.mkDerivation {
mkdir -p $out/bin
'';
- installFlags = ''
- COQLIB=$(out)/lib/coq/${coq.coq-version}/
- BINDIR=$(out)/bin
- '';
+ installFlags = [
+ "COQLIB=$(out)/lib/coq/${coq.coq-version}/"
+ "BINDIR=$(out)/bin"
+ ];
meta = {
description = "Build dependency graphs between Coq objects";
diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index b6efd3d75a4e..9ea9ac216718 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
preBuild = "coq_makefile -f _CoqProject -o Makefile";
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = with stdenv.lib; {
homepage = https://mattam82.github.io/Coq-Equations/;
diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix
index 03149bab58b1..5d3c94c5f5c8 100644
--- a/pkgs/development/coq-modules/heq/default.nix
+++ b/pkgs/development/coq-modules/heq/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
preBuild = "cd src";
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}" ];
meta = with stdenv.lib; {
homepage = https://www.mpi-sws.org/~gil/Heq/;
diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix
index 67441e9cdd8d..92484f169c15 100644
--- a/pkgs/development/coq-modules/ltac2/default.nix
+++ b/pkgs/development/coq-modules/ltac2/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
coq.ocamlPackages.camlp5
;
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = {
description = "A robust and expressive tactic language for Coq";
diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix
index 82802b8f30e7..7aad4261fd32 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/pkgs/development/coq-modules/math-classes/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ coq bignums ];
enableParallelBuilding = true;
- installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
meta = with stdenv.lib; {
homepage = https://math-classes.g