mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 11:22:58 +00:00
stdenv: installTargets is a list
This commit is contained in:
parent
65712df184
commit
ba0a3edf7f
@ -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";
|
||||
|
@ -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 ];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user