diff options
author | Merijn Broeren <merijnb@iloquent.com> | 2019-10-27 13:03:25 +0000 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 12:58:11 +0100 |
commit | 133103d7094c148bdc9152562b16c8872c44f345 (patch) | |
tree | 2ccef8bd86eff2104561da4eccdd41dd6776950b /pkgs/tools | |
parent | 08d5fc393457121b531417ee6c922e3ebee0187c (diff) |
treewide: replace make/build/configure/patchFlags with nix lists
Diffstat (limited to 'pkgs/tools')
49 files changed, 53 insertions, 53 deletions
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 239dfa0963b2..6bae355812c2 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ underlinkingPatch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index bb113c90849c..a9b5f17af832 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imlib2 ] ++ stdenv.lib.optional enableXinerama libXinerama; - buildFlags = "CC=cc " + (if enableXinerama then "xinerama=1" else "xinerama=0"); + buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; - installFlags = "DESTDIR=$(out) PREFIX="; + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = with stdenv.lib; { description = "Simple X background setter inspired by imlibsetroot and feh"; diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix index af9394a84fa5..6d5fa0f3d980 100644 --- a/pkgs/tools/X11/srandrd/default.nix +++ b/pkgs/tools/X11/srandrd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr libXinerama ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = "https://github.com/jceb/srandrd"; diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index 48cab6529ccb..d50a7c006c89 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; installPhase = '' install -D xcwd "$out/bin/xcwd" diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index d20714befba1..6fa185dfeab4 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { homepage = https://www.semicomplete.com/projects/xdotool/; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index b5350ebecf77..f8f48ea4cdb6 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that # lacks libXi. - makeFlags = "LDFLAGS=-lXi"; + makeFlags = [ "LDFLAGS=-lXi" ]; # XXX: Actually tests require an X server. doCheck = true; diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index dfac2cf88a55..4dbe31df03ca 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ]; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; meta = { homepage = https://uninformativ.de/git/xpointerbarrier; diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 9d072c9bb192..72be49d97927 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/matthewbauer/undmg; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index a17b03025032..908808b79f3c 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; }; - makeFlags = "RM=rm LN=ln MV=mv"; + makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvorbis libmad libao ]; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 81bd4f60f43e..7de086dba607 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/wodim $out/bin/cdrecord ''; - makeFlags = "PREFIX=\$(out)"; + makeFlags = [ "PREFIX=\$(out)" ]; meta = { description = "Portable command-line CD/DVD recorder software, mostly compatible with cdrtools"; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 4a8c767e44ac..533bb2322e72 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse glib attr ]; - makeFlags = "DESTDIR=$(out) PREFIX="; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { homepage = http://www.brain-dump.org/projects/ciopfs/; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index f9960722e829..b5fc12024b17 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation ''--localstatedir=/var'' ]; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index d28f73dd91c8..62fa83800cba 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - makeFlags = "CC=${stdenv.cc.outPath}/bin/cc"; + makeFlags = [ "CC=${stdenv.cc.outPath}/bin/cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix index 24d678e11422..480ae328cd38 100644 --- a/pkgs/tools/graphics/kst/default.nix +++ b/pkgs/tools/graphics/kst/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ qtbase gsl getdata netcdf muparser matio ]; - cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1"; + cmakeFlags = [ "-Dkst_qt5=1" "-Dkst_release=1" ]; postInstall = '' mkdir -p $out diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 6814a06e3b95..f7bd8d520c87 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; makefile = "Makefile.unx"; - makeFlags = "ZPATH=${zlib.static}/lib"; + makeFlags = [ "ZPATH=${zlib.static}/lib" ]; buildInputs = [ zlib ]; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 9891ea5e52b0..4b610ebbfef2 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { mkdir -p "$out"/{bin,lib,include} find . -maxdepth 1 -type f -perm -0100 -exec cp '{}' "$out"/bin ';' ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; description = ''A small QR code decoding library''; diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix index 6bb9924ddd09..c4209442de8d 100644 --- a/pkgs/tools/misc/dylibbundler/default.nix +++ b/pkgs/tools/misc/dylibbundler/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1mpd43hvpfp7pskfrjnd6vcmfii9v3p97q0ws50krkdvshp0bv2h"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Small command-line program that aims to make bundling .dylibs as easy as possible"; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 8c303dd1e0c1..af9a7c9a1332 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "19b6vqblddaw8ccw4sn0qsqzbswlhrz8ia6n4m3hymvcxn8skpz9"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Identifies duplicate files residing within specified directories"; diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 33efd2bd6143..772ae236764c 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; }; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 5b05ce534d70..24daa7fc81fa 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A better fuzzy finder"; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 61e115e71eb7..c2f281ecb17b 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { # TODO: Setting buildFlags probably isn't working properly. I've tried a few # variants, e.g.: - # - buildFlags = "-ldflags \"-s -w -X 'main.gVersion=${version}'\""; - # - buildFlags = "-ldflags \\\"-X ${goPackagePath}/main.gVersion=${version}\\\""; + # - buildFlags = [ "-ldflags" "\"-s" "-w"" ""-X 'main.gVersion=${version}'\"" ]; + # - buildFlags = [ "-ldflags" "\\\"-X" "${goPackagePath}/main.gVersion=${version}\\\"" ]; # Override the build phase (to set buildFlags): buildPhase = '' runHook preBuild diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 48f048b3abf8..57cf5bb97e2e 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { hardeningDisable = [ "all" ]; - buildFlags = "memtest.bin"; + buildFlags = [ "memtest.bin" ]; doCheck = false; # fails diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 336d673f7ecd..44f791e5b8aa 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; - buildFlags = "CC=cc"; - installFlags = "PREFIX=$(out)"; + buildFlags = [ "CC=cc" ]; + installFlags = [ "PREFIX=$(out)" ]; postInstall = '' wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index be96dd9d3d35..85bad70edc9c 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -i -e 's,/etc/pal\.conf,'$out/etc/pal.conf, src/input.c ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gettext readline ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index b530193258c9..66ed0a11fd92 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH' ''; - makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python.interpreter}"; + makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" "PYTHON=${python.interpreter}" ]; postInstall = '' wrapProgram "$out/bin/svtplay-dl" \ diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index 4cac9befe16a..b8e984e90c43 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; CGO_ENABLED = 1; - buildFlags = "-ldflags"; + buildFlags = [ "-ldflags" ]; meta = with stdenv.lib; { homepage = "https://www.teleconsole.com/"; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index edaa9b662e76..b261f0ef8411 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/xorg62/tty-clock; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index e5bb23016ae9..fda442a67294 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [perl]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "Portable file system cache diagnostics and control"; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index f042b9e209f7..77a2ef763a97 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ libxcb xcbutilwm xcbutil ]; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index cf8c370c522a..f5353db68035 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq"; }; - makeFlags = "-C src"; + makeFlags = [ "-C" "src" ]; installPhase = '' install -vD bin/* -t $out/bin diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 8a2dee19b957..f2ae143e1b9e 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; meta = with stdenv.lib; { description = '' diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index af8f5cafb894..8591db4e016c 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"; }; - makeFlags = "prefix=$(out) LDFLAGS=-lm"; + makeFlags = [ "prefix=$(out)" "LDFLAGS=-lm" ]; preConfigure = '' sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index eb8f5ef186f1..75c47dda0c40 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ curl ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5c55ac31588c..ce2936f96f3f 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -94,9 +94,9 @@ common = # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - makeFlags = "profiledir=$(out)/etc/profile.d"; + makeFlags = [ "profiledir=$(out)/etc/profile.d" ]; - installFlags = "sysconfdir=$(out)/etc"; + installFlags = [ "sysconfdir=$(out)/etc" ]; doInstallCheck = true; # not cross diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index f960245e2b33..66a9f61eefb2 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; |