Convert some *Flags from strings to lists

+62 -48
+2 -2
pkgs/applications/audio/id3v2/default.nix
··· 11 11 nativeBuildInputs = [ groff ]; 12 12 buildInputs = [ id3lib zlib ]; 13 13 14 - makeFlags = "PREFIX=$(out)"; 15 - buildFlags = "clean all"; 14 + makeFlags = [ "PREFIX=$(out)" ]; 15 + buildFlags = [ "clean" "all" ]; 16 16 17 17 preInstall = '' 18 18 mkdir -p $out/{bin,share/man/man1}
+1 -1
pkgs/applications/audio/keyfinder-cli/default.nix
··· 13 13 14 14 buildInputs = [ libav libkeyfinder ]; 15 15 16 - makeFlagsArray = "PREFIX=$(out)"; 16 + makeFlags = [ "PREFIX=$(out)" ]; 17 17 18 18 enableParallelBuilding = true; 19 19
+1 -1
pkgs/applications/networking/feedreaders/rsstail/default.nix
··· 18 18 substituteInPlace Makefile --replace -liconv_hook "" 19 19 ''; 20 20 21 - makeFlags = "prefix=$(out)"; 21 + makeFlags = [ "prefix=$(out)" ]; 22 22 enableParallelBuilding = true; 23 23 24 24 doCheck = true;
+1 -1
pkgs/applications/version-management/git-and-tools/git-hub/default.nix
··· 21 21 22 22 enableParallelBuilding = true; 23 23 24 - installFlags = "prefix=$(out)"; 24 + installFlags = [ "prefix=$(out)" ]; 25 25 26 26 postInstall = '' 27 27 # Remove inert ftdetect vim plugin and a README that's a man page subset:
+1 -1
pkgs/data/documentation/man-pages/default.nix
··· 9 9 sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8"; 10 10 }; 11 11 12 - makeFlags = "MANDIR=$(out)/share/man"; 12 + makeFlags = [ "MANDIR=$(out)/share/man" ]; 13 13 14 14 meta = with stdenv.lib; { 15 15 inherit version;
+1 -1
pkgs/development/libraries/libcli/default.nix
··· 13 13 14 14 enableParallelBuilding = true; 15 15 16 - makeFlags = "PREFIX=$(out)"; 16 + makeFlags = [ "PREFIX=$(out)" ]; 17 17 18 18 meta = with stdenv.lib; { 19 19 description = "Emulate a Cisco-style telnet command-line interface";
+1 -1
pkgs/development/libraries/libpsl/default.nix
··· 41 41 # The libpsl check phase requires the list's test scripts (tests/) as well 42 42 cp -Rv "${listSources}"/* list 43 43 ''; 44 - configureFlags = "--disable-static --enable-gtk-doc --enable-man"; 44 + configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ]; 45 45 46 46 enableParallelBuilding = true; 47 47
+8 -7
pkgs/development/tools/analysis/include-what-you-use/default.nix
··· 11 11 url = "${meta.homepage}/downloads/${name}.src.tar.gz"; 12 12 }; 13 13 14 + buildInputs = with llvmPackages; [ clang llvm ]; 15 + nativeBuildInputs = [ cmake ]; 16 + 17 + cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; 18 + 19 + enableParallelBuilding = true; 20 + 14 21 meta = with stdenv.lib; { 22 + inherit version; 15 23 description = "Analyze #includes in C/C++ source files with clang"; 16 24 longDescription = '' 17 25 For every symbol (type, function variable, or macro) that you use in ··· 26 34 platforms = platforms.linux; 27 35 maintainers = with maintainers; [ nckx ]; 28 36 }; 29 - 30 - buildInputs = with llvmPackages; [ clang llvm ]; 31 - nativeBuildInputs = [ cmake ]; 32 - 33 - cmakeFlags = "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}"; 34 - 35 - enableParallelBuilding = true; 36 37 }
+1 -1
pkgs/games/2048-in-terminal/default.nix
··· 18 18 preInstall = '' 19 19 mkdir -p $out/bin 20 20 ''; 21 - installFlags = "DESTDIR=$(out)"; 21 + installFlags = [ "DESTDIR=$(out)" ]; 22 22 23 23 meta = with stdenv.lib; { 24 24 inherit version;
+5 -1
pkgs/games/eduke32/default.nix
··· 26 26 NIX_CFLAGS_COMPILE = "-I${SDL2}/include/SDL"; 27 27 NIX_LDFLAGS = "-L${SDL2}/lib"; 28 28 29 - makeFlags = "LINKED_GTK=1 SDLCONFIG=${SDL2}/bin/sdl2-config VC_REV=${rev}"; 29 + makeFlags = [ 30 + "LINKED_GTK=1" 31 + "SDLCONFIG=${SDL2}/bin/sdl2-config" 32 + "VC_REV=${rev}" 33 + ]; 30 34 31 35 desktopItem = makeDesktopItem { 32 36 name = "eduke32";
+1 -1
pkgs/os-specific/linux/dstat/default.nix
··· 17 17 -e "s|/usr/share/dstat|$out/share/dstat|" dstat 18 18 ''; 19 19 20 - makeFlags = "prefix=$(out)"; 20 + makeFlags = [ "prefix=$(out)" ]; 21 21 22 22 postInstall = '' 23 23 wrapPythonProgramsIn $out/bin "$out $pythonPath"
+1 -1
pkgs/os-specific/linux/fatrace/default.nix
··· 16 16 --replace "'which'" "'${which}/bin/which'" 17 17 ''; 18 18 19 - makeFlagsArray = "PREFIX=$(out)"; 19 + makeFlags = [ "PREFIX=$(out)" ]; 20 20 21 21 meta = with stdenv.lib; { 22 22 inherit version;
+1 -1
pkgs/os-specific/linux/freefall/default.nix
··· 17 17 substituteInPlace freefall.c --replace "alarm(2)" "alarm(7)" 18 18 ''; 19 19 20 - makeFlags = "PREFIX=$(out)"; 20 + makeFlags = [ "PREFIX=$(out)" ]; 21 21 22 22 meta = with stdenv.lib; { 23 23 description = "Free-fall protection for spinning HP/Dell laptop hard drives";
+5 -3
pkgs/os-specific/linux/ftop/default.nix
··· 1 1 { stdenv, fetchurl, ncurses }: 2 2 3 + let version = "1.0"; in 3 4 stdenv.mkDerivation rec { 4 - name = "ftop-1.0"; 5 + name = "ftop-${version}"; 5 6 6 7 src = fetchurl { 7 8 url = "http://ftop.googlecode.com/files/${name}.tar.bz2"; ··· 14 15 ./ftop-fix_buffer_overflow.patch 15 16 ./ftop-fix_printf_format.patch 16 17 ]; 17 - patchFlags = "-p0"; 18 + patchFlags = [ "-p0" ]; 18 19 19 20 postPatch = '' 20 21 substituteInPlace configure --replace "curses" "ncurses" 21 22 ''; 22 23 23 24 meta = with stdenv.lib; { 25 + inherit version; 24 26 description = "Show progress of open files and file systems"; 25 27 homepage = https://code.google.com/p/ftop/; 26 28 license = licenses.gpl3Plus; 27 29 longDescription = '' 28 - Ftop is to files what top is to processes. The progress of all open files 30 + ftop is to files what top is to processes. The progress of all open files 29 31 and file systems can be monitored. If run as a regular user, the set of 30 32 open files will be limited to those in that user's processes (which is 31 33 generally all that is of interest to the user).
+1 -1
pkgs/os-specific/linux/mcelog/default.nix
··· 22 22 23 23 enableParallelBuilding = true; 24 24 25 - installFlags = "DESTDIR=$(out) prefix= DOCDIR=/share/doc"; 25 + installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ]; 26 26 27 27 meta = with stdenv.lib; { 28 28 inherit version;
+2 -1
pkgs/os-specific/linux/radeontop/default.nix
··· 20 20 substituteInPlace getver.sh --replace ver=unknown ver=${version} 21 21 ''; 22 22 23 - makeFlags = "PREFIX=$(out)"; 23 + makeFlags = [ "PREFIX=$(out)" ]; 24 24 25 25 meta = with stdenv.lib; { 26 + inherit version; 26 27 description = "Top-like tool for viewing AMD Radeon GPU utilization"; 27 28 longDescription = '' 28 29 View GPU utilization, both for the total activity percent and individual
+1 -1
pkgs/servers/p910nd/default.nix
··· 15 15 sed -e "s|/usr||g" -i Makefile 16 16 ''; 17 17 18 - makeFlags = "DESTDIR=$(out) BINDIR=/bin"; 18 + makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ]; 19 19 20 20 postInstall = '' 21 21 # Match the man page:
+2 -1
pkgs/tools/compression/lz4/default.nix
··· 15 15 16 16 enableParallelBuilding = true; 17 17 18 - makeFlags = "PREFIX=$(out)"; 18 + makeFlags = [ "PREFIX=$(out)" ]; 19 19 20 20 doCheck = false; # tests take a very long time 21 21 checkTarget = "test"; 22 22 23 23 meta = with stdenv.lib; { 24 + inherit version; 24 25 description = "Extremely fast compression algorithm"; 25 26 longDescription = '' 26 27 Very fast lossless compression algorithm, providing compression speed
+3 -2
pkgs/tools/filesystems/boxfs/default.nix
··· 26 26 name = "boxfs-${version}"; 27 27 28 28 src = srcs.boxfs2; 29 + 29 30 prePatch = with srcs; '' 30 31 substituteInPlace Makefile --replace "git pull" "true" 31 32 cp -a --no-preserve=mode ${libapp} libapp 32 33 cp -a --no-preserve=mode ${libjson} libjson 33 34 ''; 34 - 35 35 patches = [ ./work-around-API-borkage.patch ]; 36 36 37 37 buildInputs = [ curl fuse libxml2 ]; 38 38 nativeBuildInputs = [ pkgconfig ]; 39 39 40 - buildFlags = "static"; 40 + buildFlags = [ "static" ]; 41 41 42 42 installPhase = '' 43 43 mkdir -p $out/bin ··· 45 45 ''; 46 46 47 47 meta = with stdenv.lib; { 48 + inherit version; 48 49 description = "FUSE file system for box.com accounts"; 49 50 longDescription = '' 50 51 Store files on box.com (an account is required). The first time you run
+1 -1
pkgs/tools/misc/gparted/default.nix
··· 11 11 url = "mirror://sourceforge/gparted/${name}.tar.bz2"; 12 12 }; 13 13 14 - configureFlags = "--disable-doc"; 14 + configureFlags = [ "--disable-doc" ]; 15 15 16 16 buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ]; 17 17 nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ];
+1 -1
pkgs/tools/networking/minissdpd/default.nix
··· 14 14 15 15 buildInputs = [ libnfnetlink ]; 16 16 17 - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; 17 + installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; 18 18 19 19 enableParallelBuilding = true; 20 20
+1 -1
pkgs/tools/networking/netsniff-ng/default.nix
··· 28 28 enableParallelBuilding = true; 29 29 30 30 # All files installed to /etc are just static data that can go in the store 31 - makeFlags = "PREFIX=$(out) ETCDIR=$(out)/etc"; 31 + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; 32 32 33 33 postInstall = '' 34 34 ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat
+5 -1
pkgs/tools/package-management/dpkg/default.nix
··· 17 17 --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0" 18 18 ''; 19 19 20 - configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}"; 20 + configureFlags = [ 21 + "--disable-dselect" 22 + "--with-admindir=/var/lib/dpkg" 23 + "PERL_LIBDIR=$(out)/${perl.libPrefix}" 24 + ]; 21 25 22 26 preConfigure = '' 23 27 # Nice: dpkg has a circular dependency on itself. Its configure
+10 -10
pkgs/tools/system/foremost/default.nix
··· 9 9 url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz"; 10 10 }; 11 11 12 + patches = [ ./makefile.patch ]; 13 + 14 + makeFlags = [ "PREFIX=$(out)" ]; 15 + 16 + enableParallelBuilding = true; 17 + 18 + preInstall = '' 19 + mkdir -p $out/{bin,share/man/man8} 20 + ''; 21 + 12 22 meta = with stdenv.lib; { 13 23 inherit version; 14 24 description = "Recover files based on their contents"; ··· 26 36 platforms = platforms.linux; 27 37 maintainers = with maintainers; [ nckx ]; 28 38 }; 29 - 30 - patches = [ ./makefile.patch ]; 31 - 32 - makeFlags = "PREFIX=$(out)"; 33 - 34 - enableParallelBuilding = true; 35 - 36 - preInstall = '' 37 - mkdir -p $out/{bin,share/man/man8} 38 - ''; 39 39 }
+1 -1
pkgs/tools/system/stress-ng/default.nix
··· 19 19 20 20 enableParallelBuilding = true; 21 21 22 - installFlags = "DESTDIR=$(out)"; 22 + installFlags = [ "DESTDIR=$(out)" ]; 23 23 24 24 meta = with stdenv.lib; { 25 25 inherit version;
+4 -4
pkgs/tools/text/aha/default.nix
··· 11 11 owner = "theZiz"; 12 12 }; 13 13 14 + makeFlags = [ "PREFIX=$(out)" ]; 15 + 16 + enableParallelBuilding = true; 17 + 14 18 meta = with stdenv.lib; { 15 19 inherit version; 16 20 description = "ANSI HTML Adapter"; ··· 22 26 platforms = platforms.linux; 23 27 maintainers = with maintainers; [ nckx ]; 24 28 }; 25 - 26 - makeFlags = "PREFIX=$(out)"; 27 - 28 - enableParallelBuilding = true; 29 29 }