colin/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 13:33:53 +01:00 committed by Jan Tojnar
parent 2157dcd141
commit 65395a7105
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
23 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/mpg321/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [libao libid3tag libmad zlib] buildInputs = [libao libid3tag libmad zlib]
++ stdenv.lib.optional stdenv.isLinux alsaLib; ++ stdenv.lib.optional stdenv.isLinux alsaLib;
installTargets = "install install-man"; installTargets = [ "install" "install-man" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Command-line MP3 player"; description = "Command-line MP3 player";

2
pkgs/applications/misc/oneko/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ xlibsWrapper ]; buildInputs = [ xlibsWrapper ];
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Creates a cute cat chasing around your mouse cursor"; description = "Creates a cute cat chasing around your mouse cursor";

2
pkgs/applications/misc/xxkb/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"MANDIR=${placeholder "man"}/share/man" "MANDIR=${placeholder "man"}/share/man"
]; ];
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
meta = { meta = {
description = "A keyboard layout indicator and switcher"; description = "A keyboard layout indicator and switcher";

2
pkgs/applications/networking/ids/suricata/default.nix
View File

@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
"sysconfdir=\${out}/etc" "sysconfdir=\${out}/etc"
]; ];
installTargets = "install install-conf"; installTargets = [ "install" "install-conf" ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/suricatasc" \ wrapProgram "$out/bin/suricatasc" \

4
pkgs/applications/science/astronomy/xearth/default.nix
View File

@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ imake gccmakedep ]; nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ libXt libXext ]; buildInputs = [ libXt libXext ];
installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"]; installFlags = [ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
installTargets="install install.man"; installTargets = [ "install" "install.man" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "sets the X root window to an image of the Earth"; description = "sets the X root window to an image of the Earth";

2
pkgs/applications/window-managers/larswm/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [ libX11 libXext libXmu ]; buildInputs = [ libX11 libXext libXmu ];
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
meta = { meta = {
homepage = http://www.fnurt.net/larswm; homepage = http://www.fnurt.net/larswm;

4
pkgs/development/compilers/z88dk/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# we test in checkPhase # we test in checkPhase
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\
--replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT ='
''; '';
checkPhase = '' checkPhase = ''
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,share} mkdir -p $out/{bin,share}
''; '';
installTargets = "libs install"; installTargets = [ "libs" "install" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.z88dk.org"; homepage = "https://www.z88dk.org";

2
pkgs/development/interpreters/metamath/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
# luckily, they're not really needed so we don't build it. # luckily, they're not really needed so we don't build it.
makeFlags = [ "DATA=" ]; makeFlags = [ "DATA=" ];
installTargets = "install-exec"; installTargets = [ "install-exec" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Interpreter for the metamath proof language"; description = "Interpreter for the metamath proof language";

4
pkgs/development/libraries/qrupdate/default.nix
View File

@ -28,9 +28,7 @@ stdenv.mkDerivation {
buildFlags = [ "lib" "solib" ]; buildFlags = [ "lib" "solib" ];
installTargets = if stdenv.isDarwin installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ];
then ["install-staticlib" "install-shlib"]
else "install";
buildInputs = [ gfortran openblas ]; buildInputs = [ gfortran openblas ];

2
pkgs/development/python-modules/cld2-cffi/default.nix
View File

@ -13,7 +13,7 @@ buildPythonPackage rec {
checkInputs = [ nose ]; checkInputs = [ nose ];
# gcc doesn't approve of this code, so disable -Werror # gcc doesn't approve of this code, so disable -Werror
NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing"; NIX_CFLAGS_COMPILE = "-w" + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing";
checkPhase = "nosetests -v"; checkPhase = "nosetests -v";

2
pkgs/development/tools/literate-programming/noweb/default.nix
View File

@ -39,7 +39,7 @@ let noweb = stdenv.mkDerivation rec {
mkdir -p "$tex/tex/latex/noweb" mkdir -p "$tex/tex/latex/noweb"
''; '';
installTargets = "install-code install-tex install-elisp"; installTargets = [ "install-code" "install-tex" "install-elisp" ];
postInstall = '' postInstall = ''
substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" ""

2
pkgs/development/tools/nsis/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
''; '';
prefixKey = "PREFIX="; prefixKey = "PREFIX=";
installTargets = "install-compiler"; installTargets = [ "install-compiler" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge";

2
pkgs/development/web/wml/default.nix
View File

@ -53,7 +53,7 @@ perlPackages.buildPerlPackage {
enableParallelBuilding = false; enableParallelBuilding = false;
installTargets = "install"; installTargets = [ "install" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/"; homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/";

2
pkgs/games/xskat/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation {
-e "s|.* BINDIR .*| BINDIR = $out/bin|" \ -e "s|.* BINDIR .*| BINDIR = $out/bin|" \
-e "s|.* MANPATH .*| MANPATH = $out/man|" -e "s|.* MANPATH .*| MANPATH = $out/man|"
''; '';
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
meta = { meta = {
inherit (s) version; inherit (s) version;
description = ''Famous german card game''; description = ''Famous german card game'';

2
pkgs/misc/screensavers/xautolock/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"MANPATH=$(out)/share/man" "MANPATH=$(out)/share/man"
]; ];
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Launch a given program when your X session has been idle for a given time."; description = "Launch a given program when your X session has been idle for a given time.";

2
pkgs/os-specific/linux/nvme-cli/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# To omit the hostnqn and hostid files that are impure and should be unique # To omit the hostnqn and hostid files that are impure and should be unique
# for each target host: # for each target host:
installTargets = "install-spec"; installTargets = [ "install-spec" ];
meta = with lib; { meta = with lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;

2
pkgs/os-specific/linux/rtkit/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus libcap ]; buildInputs = [ dbus libcap ];
NIX_LDFLAGS = [ "-lrt" ]; NIX_LDFLAGS = "-lrt";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://0pointer.de/blog/projects/rtkit; homepage = http://0pointer.de/blog/projects/rtkit;

2
pkgs/tools/X11/xbrightness/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ libX11 libXaw libXext libXmu libXpm libXxf86vm ]; buildInputs = [ libX11 libXaw libXext libXmu libXpm libXxf86vm ];
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
meta = { meta = {
description = "X11 brigthness and gamma software control"; description = "X11 brigthness and gamma software control";

2
pkgs/tools/X11/xzoom/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
"BINDIR=$(out)/bin" "BINDIR=$(out)/bin"
"MANPATH=$(out)/share/man" "MANPATH=$(out)/share/man"
]; ];
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
meta = { meta = {
inherit version; inherit version;

2
pkgs/tools/cd-dvd/isomd5sum/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "DESTDIR=${placeholder "out"}" ]; makeFlags = [ "DESTDIR=${placeholder "out"}" ];
# we don't install python stuff as it borks up directories # we don't install python stuff as it borks up directories
installTargets = "install-bin install-devel"; installTargets = [ "install-bin" "install-devel" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/rhinstaller/isomd5sum; homepage = https://github.com/rhinstaller/isomd5sum;

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

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static"; makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static";
installTargets = "install_flat"; installTargets = [ "install_flat" ];
# tests currently (as of 0.8.0) get stuck in an infinite loop... # tests currently (as of 0.8.0) get stuck in an infinite loop...
# ...this is fixed in latest git, so doCheck can likely be enabled for next release # ...this is fixed in latest git, so doCheck can likely be enabled for next release

2
pkgs/tools/security/pass/extensions/genphrase.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
dontBuild = true; dontBuild = true;
installTargets = "globalinstall"; installTargets = [ "globalinstall" ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];

2
pkgs/tools/video/vncrec/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation {
"BINDIR=${placeholder "out"}/bin" "BINDIR=${placeholder "out"}/bin"
"MANDIR=${placeholder "out"}/share/man" "MANDIR=${placeholder "out"}/share/man"
]; ];
installTargets = "install install.man"; installTargets = [ "install" "install.man" ];
meta = { meta = {
description = "VNC recorder"; description = "VNC recorder";