treewide: installTargets is a list

2019-11-04 13:33:53 +01:00 · 2019-11-04 13:33:53 +01:00 · 65395a7105
parent 2157dcd141
commit 65395a7105
23 changed files with 25 additions and 27 deletions
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  buildInputs = [libao libid3tag libmad zlib]
    ++ stdenv.lib.optional stdenv.isLinux alsaLib;

-  installTargets = "install install-man";
+  installTargets = [ "install" "install-man" ];

  meta = with stdenv.lib; {
    description = "Command-line MP3 player";
--- a/pkgs/applications/misc/oneko/default.nix
+++ b/pkgs/applications/misc/oneko/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ xlibsWrapper ];

  makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
-  installTargets = "install install.man";
+  installTargets = [ "install" "install.man" ];

  meta = with stdenv.lib; {
    description = "Creates a cute cat chasing around your mouse cursor";
--- a/pkgs/applications/misc/xxkb/default.nix
+++ b/pkgs/applications/misc/xxkb/default.nix
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    "MANDIR=${placeholder "man"}/share/man"
  ];

-  installTargets = "install install.man";
+  installTargets = [ "install" "install.man" ];

  meta = {
    description = "A keyboard layout indicator and switcher";
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/pkgs/applications/networking/ids/suricata/default.nix
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
    "sysconfdir=\${out}/etc"
  ];

-  installTargets = "install install-conf";
+  installTargets = [ "install" "install-conf" ];

  postInstall = ''
    wrapProgram "$out/bin/suricatasc" \
--- a/pkgs/applications/science/astronomy/xearth/default.nix
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ imake gccmakedep ];
  buildInputs = [ libXt libXext ];

-  installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
-  installTargets="install install.man";
+  installFlags = [ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
+  installTargets = [ "install" "install.man" ];

  meta = with stdenv.lib; {
    description = "sets the X root window to an image of the Earth";
--- a/pkgs/applications/window-managers/larswm/default.nix
+++ b/pkgs/applications/window-managers/larswm/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation {
  buildInputs = [ libX11 libXext libXmu ];

  makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
-  installTargets = "install install.man";
+  installTargets = [ "install" "install.man" ];

  meta = {
    homepage = http://www.fnurt.net/larswm;
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/pkgs/development/compilers/z88dk/default.nix
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
    # we test in checkPhase
    substituteInPlace Makefile \
      --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\
-      --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT ='   
+      --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT ='
  '';

  checkPhase = ''
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
    mkdir -p $out/{bin,share}
  '';

-  installTargets = "libs install";
+  installTargets = [ "libs" "install" ];

  meta = with stdenv.lib; {
    homepage    = "https://www.z88dk.org";
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation {
  # luckily, they're not really needed so we don't build it.
  makeFlags = [ "DATA=" ];

-  installTargets = "install-exec";
+  installTargets = [ "install-exec" ];

  meta = with stdenv.lib; {
    description = "Interpreter for the metamath proof language";
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@ -28,9 +28,7 @@ stdenv.mkDerivation {

  buildFlags = [ "lib" "solib" ];

-  installTargets = if stdenv.isDarwin
-                   then ["install-staticlib" "install-shlib"]
-                   else "install";
+  installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ];

  buildInputs = [ gfortran openblas ];

--- a/pkgs/development/python-modules/cld2-cffi/default.nix
+++ b/pkgs/development/python-modules/cld2-cffi/default.nix
@ -13,7 +13,7 @@ buildPythonPackage rec {
  checkInputs = [ nose ];

  # gcc doesn't approve of this code, so disable -Werror
-  NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing";
+  NIX_CFLAGS_COMPILE = "-w" + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing";

  checkPhase = "nosetests -v";

--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@ -39,7 +39,7 @@ let noweb = stdenv.mkDerivation rec {
    mkdir -p "$tex/tex/latex/noweb"
  '';

-  installTargets = "install-code install-tex install-elisp";
+  installTargets = [ "install-code" "install-tex" "install-elisp" ];

  postInstall = ''
    substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" ""
--- a/pkgs/development/tools/nsis/default.nix
+++ b/pkgs/development/tools/nsis/default.nix
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
  '';

  prefixKey = "PREFIX=";
-  installTargets = "install-compiler";
+  installTargets = [ "install-compiler" ];

  meta = with stdenv.lib; {
    description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge";
--- a/pkgs/development/web/wml/default.nix
+++ b/pkgs/development/web/wml/default.nix
@ -53,7 +53,7 @@ perlPackages.buildPerlPackage {

  enableParallelBuilding = false;

-  installTargets = "install";
+  installTargets = [ "install" ];

  meta = with stdenv.lib; {
    homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/";
--- a/pkgs/games/xskat/default.nix
+++ b/pkgs/games/xskat/default.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation {
      -e "s|.* BINDIR .*|   BINDIR = $out/bin|" \
      -e "s|.* MANPATH .*|  MANPATH = $out/man|"
  '';
-  installTargets = "install install.man";
+  installTargets = [ "install" "install.man" ];
  meta = {
    inherit (s) version;
    description = ''Famous german card game'';
--- a/pkgs/misc/screensavers/xautolock/default.nix
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    "MANPATH=$(out)/share/man"
  ];

-  installTargets = "install install.man";
+  installTargets = [ "install" "install.man" ];

  meta = with stdenv.lib; {
    description = "Launch a given program when your X session has been idle for a given time.";
--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/pkgs/os-specific/linux/nvme-cli/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  # To omit the hostnqn and hostid files that are impure and should be unique
  # for each target host:
-  installTargets = "install-spec";
+  installTargets = [ "install-spec" ];

  meta = with lib; {
    inherit (src.meta) homepage;
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ dbus libcap ];
-  NIX_LDFLAGS = [ "-lrt" ];
+  NIX_LDFLAGS = "-lrt";

  meta = with stdenv.lib; {
    homepage = http://0pointer.de/blog/projects/rtkit;
--- a/pkgs/tools/X11/xbrightness/default.nix
+++ b/pkgs/tools/X11/xbrightness/default.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation {
  buildInputs = [ libX11 libXaw libXext libXmu libXpm libXxf86vm ];

  makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
-  installTargets = "install install.man";
+  installTargets = [ "install" "install.man" ];

  meta = {
    description = "X11 brigthness and gamma software control";
--- a/pkgs/tools/X11/xzoom/default.nix
+++ b/pkgs/tools/X11/xzoom/default.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
    "BINDIR=$(out)/bin"
    "MANPATH=$(out)/share/man"
  ];
-  installTargets = "install install.man";
+  installTargets = [ "install" "install.man" ];

  meta = {
    inherit version;
--- a/pkgs/tools/cd-dvd/isomd5sum/default.nix
+++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
  makeFlags = [ "DESTDIR=${placeholder "out"}" ];

  # we don't install python stuff as it borks up directories
-  installTargets = "install-bin install-devel";
+  installTargets = [ "install-bin" "install-devel" ];

  meta = with stdenv.lib; {
    homepage = https://github.com/rhinstaller/isomd5sum;
--- a/pkgs/tools/misc/toybox/default.nix
+++ b/pkgs/tools/misc/toybox/default.nix
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {

  makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static";

-  installTargets = "install_flat";
+  installTargets = [ "install_flat" ];

  # tests currently (as of 0.8.0) get stuck in an infinite loop...
  # ...this is fixed in latest git, so doCheck can likely be enabled for next release
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  dontBuild = true;

-  installTargets = "globalinstall";
+  installTargets = [ "globalinstall" ];

  installFlags = [ "PREFIX=$(out)" ];

--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@ -22,7 +22,7 @@ stdenv.mkDerivation {
    "BINDIR=${placeholder "out"}/bin"
    "MANDIR=${placeholder "out"}/share/man"
  ];
-  installTargets = "install install.man";
+  installTargets = [ "install" "install.man" ];

  meta = {
    description = "VNC recorder";