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

treewide: installTargets is a list

Browse Source
This commit is contained in:
Robin Gloster 2019-11-04 12:23:53 +01:00 committed by Jan Tojnar
parent ba0a3edf7f
commit 755db0b689
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
18 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs/25.nix
View File

@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
done done
''; '';
installTargets = "tags install"; installTargets = [ "tags" "install" ];
postInstall = '' postInstall = ''
mkdir -p $out/share/emacs/site-lisp mkdir -p $out/share/emacs/site-lisp

2
pkgs/applications/office/antiword/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; patches = [ ./10_fix_buffer_overflow_wordole_c.patch ];
installTargets = "global_install"; installTargets = [ "global_install" ];
meta = { meta = {
homepage = http://www.winfield.demon.nl/; homepage = http://www.winfield.demon.nl/;

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

@ -225,10 +225,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets = installTargets = optional stripped "install-strip";
if stripped
then "install-strip"
else "install";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

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

@ -231,10 +231,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets = installTargets = optional stripped "install-strip";
if stripped
then "install-strip"
else "install";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

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

@ -242,10 +242,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets = installTargets = optional stripped "install-strip";
if stripped
then "install-strip"
else "install";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

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

@ -250,10 +250,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets = installTargets = optional stripped "install-strip";
if stripped
then "install-strip"
else "install";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

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

@ -221,10 +221,7 @@ stdenv.mkDerivation ({
doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
installTargets = installTargets = optional stripped "install-strip";
if stripped
then "install-strip"
else "install";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

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

@ -207,10 +207,7 @@ stdenv.mkDerivation ({
dontStrip = !stripped; dontStrip = !stripped;
installTargets = installTargets = optional stripped "install-strip";
if stripped
then "install-strip"
else "install";
# https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";

4
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -24,7 +24,7 @@
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
, buildPhase ? "", preBuild ? "", postBuild ? "" , buildPhase ? "", preBuild ? "", postBuild ? ""
, installPhase ? "", preInstall ? "", postInstall ? "" , installPhase ? "", preInstall ? "", postInstall ? ""
, installTargets ? "install install-docs" , installTargets ? [ "install" "install-docs" ]
, checkPhase ? "", preCheck ? "", postCheck ? "" , checkPhase ? "", preCheck ? "", postCheck ? ""
, fixupPhase ? "", preFixup ? "", postFixup ? "" , fixupPhase ? "", preFixup ? "", postFixup ? ""
, meta ? {} , meta ? {}
@ -141,7 +141,7 @@ in stdenv.mkDerivation ({
// optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (preCheck != "") { inherit preCheck; }
// optionalAttrs (postCheck != "") { inherit postCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; }
// optionalAttrs (installPhase != "") { inherit installPhase; } // optionalAttrs (installPhase != "") { inherit installPhase; }
// optionalAttrs (installTargets != "") { inherit installTargets; } // optionalAttrs (installTargets != []) { inherit installTargets; }
// optionalAttrs (preInstall != "") { inherit preInstall; } // optionalAttrs (preInstall != "") { inherit preInstall; }
// optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (fixupPhase != "") { inherit fixupPhase; }
// optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (preFixup != "") { inherit preFixup; }

2
pkgs/development/libraries/crypto++/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store 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" ]; installFlags = [ "LDCONF=true" ];
postInstall = optionalString (!stdenv.hostPlatform.isDarwin) '' postInstall = optionalString (!stdenv.hostPlatform.isDarwin) ''
ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version} ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version}

2
pkgs/development/libraries/libscrypt/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA=";
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
installTargets = if stdenv.isDarwin then "install-osx" else "install"; installTargets = stdenv.lib.optional stdenv.isDarwin "install-osx";
doCheck = true; doCheck = true;

2
pkgs/development/ocaml-modules/functory/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
installTargets = "ocamlfind-install"; installTargets = [ "ocamlfind-install" ];
createFindlibDestdir = true; createFindlibDestdir = true;

2
pkgs/development/tools/misc/dialog/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
"--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}" "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}"
]; ];
installTargets = "install${stdenv.lib.optionalString withLibrary "-full"}"; installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ];
meta = { meta = {
homepage = https://invisible-island.net/dialog/dialog.html; homepage = https://invisible-island.net/dialog/dialog.html;

2
pkgs/misc/drivers/foomatic-filters/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell} substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell}
''; '';
installTargets = "install-cups"; installTargets = [ "install-cups" ];
installFlags = [ installFlags = [
"CUPS_FILTERS=$(out)/lib/cups/filter" "CUPS_FILTERS=$(out)/lib/cups/filter"

2
pkgs/servers/gpsd/default.nix
View File

@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
preInstall = '' preInstall = ''
mkdir -p "$out/lib/udev/rules.d" mkdir -p "$out/lib/udev/rules.d"
''; '';
installTargets = "install udev-install"; installTargets = [ "install" "udev-install" ];
postFixup = '' postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath" wrapPythonProgramsIn $out/bin "$out $pythonPath"

2
pkgs/tools/misc/bibtool/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# Perl for running test suite. # Perl for running test suite.
buildInputs = [ perl ]; buildInputs = [ perl ];
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
doCheck = true; doCheck = true;

2
pkgs/tools/system/fcron/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
"--disable-checks" "--disable-checks"
]; ];
installTargets = "install-staged"; # install does also try to change permissions of /etc/* files installTargets = [ "install-staged" ]; # install does also try to change permissions of /etc/* files
# fcron tries to install pid into system directory on install # fcron tries to install pid into system directory on install
installFlags = [ installFlags = [

4
pkgs/top-level/perl-packages.nix
View File

@ -11242,7 +11242,7 @@ let
outputs = [ "out" "dev" ]; # no "devdoc" outputs = [ "out" "dev" ]; # no "devdoc"
installTargets = "install"; installTargets = [ "install" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.mhonarc.org/"; homepage = "https://www.mhonarc.org/";
@ -20609,7 +20609,7 @@ let
}; };
propagatedBuildInputs = [ XMLParser XMLSAX ]; propagatedBuildInputs = [ XMLParser XMLSAX ];
# Avoid creating perllocal.pod, which contains a timestamp # Avoid creating perllocal.pod, which contains a timestamp
installTargets = "pure_install"; installTargets = [ "pure_install" ];
meta = { meta = {
description = "SAX Driver for Expat"; description = "SAX Driver for Expat";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];