diff options
author | Robin Gloster <mail@glob.in> | 2019-11-04 12:23:53 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:25:26 +0100 |
commit | 755db0b68937dd97e74f427b03a811fceaeba59f (patch) | |
tree | 34bd48f59b0f18dd1f509982499c619a25e467a5 /pkgs/development | |
parent | ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7 (diff) | |
download | nixlib-755db0b68937dd97e74f427b03a811fceaeba59f.tar nixlib-755db0b68937dd97e74f427b03a811fceaeba59f.tar.gz nixlib-755db0b68937dd97e74f427b03a811fceaeba59f.tar.bz2 nixlib-755db0b68937dd97e74f427b03a811fceaeba59f.tar.lz nixlib-755db0b68937dd97e74f427b03a811fceaeba59f.tar.xz nixlib-755db0b68937dd97e74f427b03a811fceaeba59f.tar.zst nixlib-755db0b68937dd97e74f427b03a811fceaeba59f.zip |
treewide: installTargets is a list
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/crypto++/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libscrypt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/functory/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/dialog/default.nix | 2 |
11 files changed, 12 insertions, 30 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ae96d5a1ef90..ef697b74bbe3 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -225,10 +225,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 5194f607f3b6..2f85fc4b7e8c 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -231,10 +231,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index cddfd58aa53b..f68ddc81f81f 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -242,10 +242,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 3ac4fa7032a7..b1a981cfdf7f 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -250,10 +250,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 237cb455f9fa..22d772cff6d6 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -221,10 +221,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 9698f4db2861..7ff8d7529ca3 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -207,10 +207,7 @@ stdenv.mkDerivation ({ dontStrip = !stripped; - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 76f71745f355..c0203e5915f7 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -24,7 +24,7 @@ , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" , buildPhase ? "", preBuild ? "", postBuild ? "" , installPhase ? "", preInstall ? "", postInstall ? "" -, installTargets ? "install install-docs" +, installTargets ? [ "install" "install-docs" ] , checkPhase ? "", preCheck ? "", postCheck ? "" , fixupPhase ? "", preFixup ? "", postFixup ? "" , meta ? {} @@ -141,7 +141,7 @@ in stdenv.mkDerivation ({ // optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; } // optionalAttrs (installPhase != "") { inherit installPhase; } -// optionalAttrs (installTargets != "") { inherit installTargets; } +// optionalAttrs (installTargets != []) { inherit installTargets; } // optionalAttrs (preInstall != "") { inherit preInstall; } // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (preFixup != "") { inherit preFixup; } diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index b472733f8ee6..3fe277481553 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store - installTargets = "install-lib"; + installTargets = [ "install-lib" ]; installFlags = [ "LDCONF=true" ]; postInstall = optionalString (!stdenv.hostPlatform.isDarwin) '' ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version} diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index b9ae1f829a1b..3083136526bf 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; installFlags = [ "PREFIX=$(out)" ]; - installTargets = if stdenv.isDarwin then "install-osx" else "install"; + installTargets = stdenv.lib.optional stdenv.isDarwin "install-osx"; doCheck = true; diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index c8b29759b97c..18b5fb39776b 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ]; - installTargets = "ocamlfind-install"; + installTargets = [ "ocamlfind-install" ]; createFindlibDestdir = true; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 378cc4683b41..b82429cdac5f 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}" ]; - installTargets = "install${stdenv.lib.optionalString withLibrary "-full"}"; + installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ]; meta = { homepage = https://invisible-island.net/dialog/dialog.html; |