diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-03 22:57:05 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:24:02 +0100 |
| commit | ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7 (patch) | |
| tree | 34bf16554d1c576517907a525f6a0b251bf7fa2f /pkgs/development | |
| parent | 65712df184aaa6da1030e872a122c16f7d52585e (diff) | |
| download | nixpkgs-ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7.tar nixpkgs-ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7.tar.gz nixpkgs-ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7.tar.bz2 nixpkgs-ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7.tar.lz nixpkgs-ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7.tar.xz nixpkgs-ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7.tar.zst nixpkgs-ba0a3edf7ff15fdcc534bcf7180bf2c1d8f964e7.zip | |
stdenv: installTargets is a list
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/gcc/8/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/common.nix | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index c9302cc4f74..c6b785f84a4 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -208,10 +208,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/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 7741f2d4ffb..df0a889bd20 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -30,10 +30,8 @@ stdenv.mkDerivation { configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; - preInstall = '' - installFlags="TEXMF=$out/texmf-dist"; - installTargets="install install-tex"; - ''; + installFlags = [ "TEXMF=$(out)/texmf-dist" ]; + installTargets = [ "install" "install-tex" ]; checkInputs = [ procps ]; |