JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stdenv: installTargets is a list

Browse Source
This commit is contained in:
Robin Gloster 2019-11-03 22:57:05 +01:00 committed by Jan Tojnar
parent 65712df184
commit ba0a3edf7f
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/gcc/8/default.nix
View File

@ -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";

6
pkgs/development/tools/misc/texinfo/common.nix
View File

@ -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 ];