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

treewide: replace make/build/configure/patchFlags with nix lists

Browse Source
This commit is contained in:
Merijn Broeren
2019-12-30 12:58:11 +01:00
committed by Jan Tojnar
parent 08d5fc3934
commit 133103d709
248 changed files with 336 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/broadcom-sta/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
./gcc.patch
];
makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}";
makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ];
unpackPhase = ''
sourceRoot=broadcom-sta
pkgs/os-specific/linux/cifs-utils/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ kerberos keyutils pam talloc ];
makeFlags = "root_sbindir=$(out)/sbin";
makeFlags = [ "root_sbindir=$(out)/sbin" ];
meta = with stdenv.lib; {
homepage = http://www.samba.org/linux-cifs/cifs-utils/;
pkgs/os-specific/linux/dmidecode/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07";
};
makeFlags = "prefix=$(out)";
makeFlags = [ "prefix=$(out)" ];
meta = with stdenv.lib; {
homepage = https://www.nongnu.org/dmidecode/;
pkgs/os-specific/linux/drbd/default.nix
+6 -2
View File
@@ -31,9 +31,13 @@ stdenv.mkDerivation rec {
substituteInPlace scripts/drbd.rules --replace /usr/sbin/drbdadm $out/sbin/drbdadm
'';
makeFlags = "SHELL=${stdenv.shell}";
makeFlags = [ "SHELL=${stdenv.shell}" ];
installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d";
installFlags = [
"localstatedir=$(TMPDIR)/var"
"sysconfdir=$(out)/etc"
"INITDIR=$(out)/etc/init.d"
];
meta = with stdenv.lib; {
homepage = http://www.drbd.org/;
pkgs/os-specific/linux/extrace/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85";
};
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
postInstall = ''
install -dm755 "$out/share/licenses/extrace/"
pkgs/os-specific/linux/jool/cli.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libnl iptables ];
makeFlags = "-C src/usr";
makeFlags = [ "-C" "src/usr" ];
prePatch = ''
sed -e 's%^XTABLES_SO_DIR = .*%XTABLES_SO_DIR = '"$out"'/lib/xtables%g' -i src/usr/iptables/Makefile
pkgs/os-specific/linux/ldm/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
sed '16i#include <sys/stat.h>' -i ldm.c
'';
buildFlags = "ldm";
buildFlags = [ "ldm" ];
installPhase = ''
mkdir -p $out/bin
pkgs/os-specific/linux/mmc-utils/default.nix
+1 -1
View File
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7";
};
makeFlags = "CC=${stdenv.cc.targetPrefix}cc";
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
make install prefix=$out
pkgs/os-specific/linux/numad/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "install -m" "install -Dm"
'';
makeFlags = "prefix=$(out)";
makeFlags = [ "prefix=$(out)" ];
meta = with stdenv.lib; {
description = "A user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access";
pkgs/os-specific/linux/pam_mount/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sh autogen.sh --prefix=$out
'';
makeFlags = "DESTDIR=$(out)";
makeFlags = [ "DESTDIR=$(out)" ];
# Probably a hack, but using DESTDIR and PREFIX makes everything work!
postInstall = ''
pkgs/os-specific/linux/pcmciautils/default.nix
+2 -2
View File
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
ln -sf ${configOpts} ./config/config.opts'')
;
makeFlags = "LEX=flex";
installFlags = ''INSTALL=install DESTDIR=''${out}'';
makeFlags = [ "LEX=flex" ];
installFlags = [ "INSTALL=install" "DESTDIR=${placeholder "out"}" ];
postInstall =
lib.concatMapStrings (path: ''
for f in : $(find ${path} -type f); do
pkgs/os-specific/linux/rfkill/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy";
};
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = http://wireless.kernel.org/en/users/Documentation/rfkill;
pkgs/os-specific/linux/rtl8192eu/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
enableParallelBuilding = true;
pkgs/os-specific/linux/rtlwifi_new/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
enableParallelBuilding = true;
pkgs/os-specific/linux/sysstat/default.nix
+2 -2
View File
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
export SYSTEMCTL=systemctl
'';
makeFlags = "SYSCONFIG_DIR=$(out)/etc IGNORE_FILE_ATTRIBUTES=y CHOWN=true";
installTargets = "install_base install_nls install_man";
makeFlags = [ "SYSCONFIG_DIR=$(out)/etc" "IGNORE_FILE_ATTRIBUTES=y" "CHOWN=true" ];
installTargets = [ "install_base" "install_nls" "install_man" ];
patches = [ ./install.patch ];
pkgs/os-specific/linux/untie/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m";
};
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "A tool to run processes untied from some of the namespaces";