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

treewide: installFlags is a list

Browse Source
This commit is contained in:
Robin Gloster
2019-11-05 02:10:31 +01:00
committed by Jan Tojnar
parent 133103d709
commit 2157dcd141
70 changed files with 86 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/archivers/afio/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
*/
patches = [ ./0001-makefile-fix-installation.patch ];
installFlags = "DESTDIR=$(out)";
installFlags = [ "DESTDIR=$(out)" ];
meta = {
homepage = http://members.chello.nl/~k.holtman/afio.html;

2
pkgs/tools/compression/pbzip2/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
preBuild = "substituteInPlace Makefile --replace g++ c++";
installFlags = "PREFIX=$(out)";
installFlags = [ "PREFIX=$(out)" ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal";

2
pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation {
#patches = [ ./purity.patch ];
# To prevent make install from failing.
preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
installFlags = [ "OWNER=" "GROUP=" "confdir=${placeholder "out"}/etc" ];
# Install systemd stuff.
#installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration";

2
pkgs/tools/filesystems/sasquatch/default.nix
View File

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
cd squashfs-tools
'';
installFlags = "INSTALL_DIR=\${out}/bin";
installFlags = [ "INSTALL_DIR=\${out}/bin" ];
makeFlags = [ "XZ_SUPPORT=1" ]
++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";

2
pkgs/tools/filesystems/squashfs/default.nix
View File

@@ -29,7 +29,7 @@ stdenv.mkDerivation {
preBuild = "cd squashfs-tools";
installFlags = "INSTALL_DIR=\${out}/bin";
installFlags = [ "INSTALL_DIR=\${out}/bin" ];
makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ]
++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";

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

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ git ronn ];
installFlags = "DESTDIR=$(out)";
installFlags = [ "DESTDIR=$(out)" ];
meta = with stdenv.lib; {
homepage = https://github.com/schlomo/automirror;

2
pkgs/tools/networking/iodine/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\"";
installFlags = "prefix=\${out}";
installFlags = [ "prefix=\${out}" ];
meta = {
homepage = http://code.kryo.se/iodine/;

2
pkgs/tools/networking/openresolv/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
EOF
'';
installFlags = "SYSCONFDIR=$(out)/etc";
installFlags = [ "SYSCONFDIR=$(out)/etc" ];
postInstall = ''
wrapProgram "$out/sbin/resolvconf" --set PATH "${coreutils}/bin"

2
pkgs/tools/networking/ssmtp/default.nix
View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation {
--replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)'
'';
installFlags = "etcdir=$(out)/etc";
installFlags = [ "etcdir=$(out)/etc" ];
installTargets = [ "install" "install-sendmail" ];

4
pkgs/tools/security/rarcrack/default.nix
View File

@@ -12,8 +12,8 @@ stdenv.mkDerivation {
};
buildInputs = [ libxml2 file p7zip unrar unzip ];
buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null;
installFlags = "PREFIX=\${out}";
buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang";
installFlags = [ "PREFIX=\${out}" ];
patchPhase = ''
substituteInPlace rarcrack.c --replace "file -i" "${file}/bin/file -i"

2
pkgs/tools/security/super/default.nix
View File

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
];
installFlags = "sysconfdir=$(out)/etc localstatedir=$(TMPDIR)";
installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(TMPDIR)" ];
meta = {
homepage = "https://www.ucolick.org/~will/#super";

2
pkgs/tools/security/tboot/default.nix
View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
substituteInPlace docs/Makefile --replace /usr/share /share
'';
installFlags = "DESTDIR=$(out)";
installFlags = [ "DESTDIR=$(out)" ];
meta = with stdenv.lib; {
description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM";

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

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ groff ];
installFlags = ''DESTDIR=$(out)'';
installFlags = [ "DESTDIR=$(out)" ];
postConfigure = ''
sed -e s@/usr/man/@/share/man/@ -i Makefile

4
pkgs/tools/text/untex/default.nix
View File

@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
unpackPhase = "tar xf $src";
installTargets = "install install.man";
installFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man/man1";
installTargets = [ "install" "install.man" ];
installFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man/man1" ];
preBuild = ''
sed -i '1i#include <stdlib.h>\n#include <string.h>' untex.c
mkdir -p $out/bin $out/share/man/man1