diff options
author | Robin Gloster <mail@glob.in> | 2019-11-05 02:10:31 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 13:22:43 +0100 |
commit | 2157dcd141a5df499698ffb9b1d901192f089bdc (patch) | |
tree | aff6dd99868e7b461d5b5f87f347c079960862ed /pkgs/os-specific | |
parent | 133103d7094c148bdc9152562b16c8872c44f345 (diff) | |
download | nixpkgs-2157dcd141a5df499698ffb9b1d901192f089bdc.tar nixpkgs-2157dcd141a5df499698ffb9b1d901192f089bdc.tar.gz nixpkgs-2157dcd141a5df499698ffb9b1d901192f089bdc.tar.bz2 nixpkgs-2157dcd141a5df499698ffb9b1d901192f089bdc.tar.lz nixpkgs-2157dcd141a5df499698ffb9b1d901192f089bdc.tar.xz nixpkgs-2157dcd141a5df499698ffb9b1d901192f089bdc.tar.zst nixpkgs-2157dcd141a5df499698ffb9b1d901192f089bdc.zip |
treewide: installFlags is a list
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/alsa-oss/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/alsa-utils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/consoletools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/open-isns/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/paxtest/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sysklogd/default.nix | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index d3e7dd5fa5d..77b351a1998 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-xmlto" ]; - installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 8b1faf788e5..7b356746861 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; - installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index 8ea3e3445cc..c46af5fba85 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)"]; - installFlags = ''PREFIX=""''; + installFlags = [ "PREFIX=\"\"" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/linuxconsole/; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 37b728bde88..f343f11f5b6 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { doInstallCheck = false; # same separateDebugInfo = true; - installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)"; + installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; preFixup = '' wrapProgram $out/bin/perf \ diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 9c730bb9659..174f1be99db 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --replace 'man_prefix=$(prefix)' "man_prefix=$doc" ''; - installFlags = "RAISE_SETFCAP=no"; + installFlags = [ "RAISE_SETFCAP=no" ]; postInstall = '' rm "$lib"/lib/*.a diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 7b34c1029ba..6a0273afbdd 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" ]; - installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns"; - installTargets = "install install_hdrs install_lib"; + installFlags = [ "etcdir=$(out)/etc" "vardir=$(out)/var/lib/isns" ]; + installTargets = [ "install" "install_hdrs" "install_lib" ]; meta = { description = "iSNS server and client for Linux"; diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index e01f84576ce..6bd59e1e7fd 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makefile = "Makefile.psm"; makeFlags = [ "PAXBIN=${paxctl}/bin/paxctl" "BINDIR=$(out)/bin" "RUNDIR=$(out)/lib/paxtest" ]; - installFlags = ''DESTDIR=""''; + installFlags = [ "DESTDIR=\"\"" ]; meta = with stdenv.lib; { description = "Test various memory protection measures"; diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 513503ff98e..213394e5ecc 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DSYSV"; - installFlags = "BINDIR=$(out)/sbin MANDIR=$(out)/share/man INSTALL=install"; + installFlags = [ "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "INSTALL=install" ]; preConfigure = '' |