Convert some *Flags from strings to lists

This commit is contained in:
Tobias Geerinckx-Rice 2015-11-26 18:44:44 +01:00
parent 8fe518e763
commit 2798b02ad0
26 changed files with 62 additions and 48 deletions

View file

@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ groff ];
buildInputs = [ id3lib zlib ];
makeFlags = "PREFIX=$(out)";
buildFlags = "clean all";
makeFlags = [ "PREFIX=$(out)" ];
buildFlags = [ "clean" "all" ];
preInstall = ''
mkdir -p $out/{bin,share/man/man1}

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libav libkeyfinder ];
makeFlagsArray = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace -liconv_hook ""
'';
makeFlags = "prefix=$(out)";
makeFlags = [ "prefix=$(out)" ];
enableParallelBuilding = true;
doCheck = true;

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
installFlags = "prefix=$(out)";
installFlags = [ "prefix=$(out)" ];
postInstall = ''
# Remove inert ftdetect vim plugin and a README that's a man page subset:

View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8";
};
makeFlags = "MANDIR=$(out)/share/man";
makeFlags = [ "MANDIR=$(out)/share/man" ];
meta = with stdenv.lib; {
inherit version;

View file

@ -13,7 +13,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "Emulate a Cisco-style telnet command-line interface";

View file

@ -41,7 +41,7 @@ in stdenv.mkDerivation {
# The libpsl check phase requires the list's test scripts (tests/) as well
cp -Rv "${listSources}"/* list
'';
configureFlags = "--disable-static --enable-gtk-doc --enable-man";
configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ];
enableParallelBuilding = true;

View file

@ -11,7 +11,15 @@ in stdenv.mkDerivation rec {
url = "${meta.homepage}/downloads/${name}.src.tar.gz";
};
buildInputs = with llvmPackages; [ clang llvm ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
inherit version;
description = "Analyze #includes in C/C++ source files with clang";
longDescription = ''
For every symbol (type, function variable, or macro) that you use in
@ -26,11 +34,4 @@ in stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = with llvmPackages; [ clang llvm ];
nativeBuildInputs = [ cmake ];
cmakeFlags = "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}";
enableParallelBuilding = true;
}

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
preInstall = ''
mkdir -p $out/bin
'';
installFlags = "DESTDIR=$(out)";
installFlags = [ "DESTDIR=$(out)" ];
meta = with stdenv.lib; {
inherit version;

View file

@ -26,7 +26,11 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${SDL2}/include/SDL";
NIX_LDFLAGS = "-L${SDL2}/lib";
makeFlags = "LINKED_GTK=1 SDLCONFIG=${SDL2}/bin/sdl2-config VC_REV=${rev}";
makeFlags = [
"LINKED_GTK=1"
"SDLCONFIG=${SDL2}/bin/sdl2-config"
"VC_REV=${rev}"
];
desktopItem = makeDesktopItem {
name = "eduke32";

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
-e "s|/usr/share/dstat|$out/share/dstat|" dstat
'';
makeFlags = "prefix=$(out)";
makeFlags = [ "prefix=$(out)" ];
postInstall = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
--replace "'which'" "'${which}/bin/which'"
'';
makeFlagsArray = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
inherit version;

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation {
substituteInPlace freefall.c --replace "alarm(2)" "alarm(7)"
'';
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "Free-fall protection for spinning HP/Dell laptop hard drives";

View file

@ -1,7 +1,8 @@
{ stdenv, fetchurl, ncurses }:
let version = "1.0"; in
stdenv.mkDerivation rec {
name = "ftop-1.0";
name = "ftop-${version}";
src = fetchurl {
url = "http://ftop.googlecode.com/files/${name}.tar.bz2";
@ -14,18 +15,19 @@ stdenv.mkDerivation rec {
./ftop-fix_buffer_overflow.patch
./ftop-fix_printf_format.patch
];
patchFlags = "-p0";
patchFlags = [ "-p0" ];
postPatch = ''
substituteInPlace configure --replace "curses" "ncurses"
'';
meta = with stdenv.lib; {
inherit version;
description = "Show progress of open files and file systems";
homepage = https://code.google.com/p/ftop/;
license = licenses.gpl3Plus;
longDescription = ''
Ftop is to files what top is to processes. The progress of all open files
ftop is to files what top is to processes. The progress of all open files
and file systems can be monitored. If run as a regular user, the set of
open files will be limited to those in that user's processes (which is
generally all that is of interest to the user).

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
installFlags = "DESTDIR=$(out) prefix= DOCDIR=/share/doc";
installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ];
meta = with stdenv.lib; {
inherit version;

View file

@ -20,9 +20,10 @@ stdenv.mkDerivation {
substituteInPlace getver.sh --replace ver=unknown ver=${version}
'';
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
inherit version;
description = "Top-like tool for viewing AMD Radeon GPU utilization";
longDescription = ''
View GPU utilization, both for the total activity percent and individual

View file

@ -15,7 +15,7 @@ in stdenv.mkDerivation {
sed -e "s|/usr||g" -i Makefile
'';
makeFlags = "DESTDIR=$(out) BINDIR=/bin";
makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ];
postInstall = ''
# Match the man page:

View file

@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = "PREFIX=$(out)";
makeFlags = [ "PREFIX=$(out)" ];
doCheck = false; # tests take a very long time
checkTarget = "test";
meta = with stdenv.lib; {
inherit version;
description = "Extremely fast compression algorithm";
longDescription = ''
Very fast lossless compression algorithm, providing compression speed

View file

@ -26,18 +26,18 @@ in stdenv.mkDerivation {
name = "boxfs-${version}";
src = srcs.boxfs2;
prePatch = with srcs; ''
substituteInPlace Makefile --replace "git pull" "true"
cp -a --no-preserve=mode ${libapp} libapp
cp -a --no-preserve=mode ${libjson} libjson
'';
patches = [ ./work-around-API-borkage.patch ];
buildInputs = [ curl fuse libxml2 ];
nativeBuildInputs = [ pkgconfig ];
buildFlags = "static";
buildFlags = [ "static" ];
installPhase = ''
mkdir -p $out/bin
@ -45,6 +45,7 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "FUSE file system for box.com accounts";
longDescription = ''
Store files on box.com (an account is required). The first time you run

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/gparted/${name}.tar.bz2";
};
configureFlags = "--disable-doc";
configureFlags = [ "--disable-doc" ];
buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ];
nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ];

View file

@ -14,7 +14,7 @@ in stdenv.mkDerivation {
buildInputs = [ libnfnetlink ];
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
enableParallelBuilding = true;

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
# All files installed to /etc are just static data that can go in the store
makeFlags = "PREFIX=$(out) ETCDIR=$(out)/etc";
makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
postInstall = ''
ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat

View file

@ -17,7 +17,11 @@ stdenv.mkDerivation {
--replace "stackprotectorstrong => 1" "stackprotectorstrong => 0"
'';
configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}";
configureFlags = [
"--disable-dselect"
"--with-admindir=/var/lib/dpkg"
"PERL_LIBDIR=$(out)/${perl.libPrefix}"
];
preConfigure = ''
# Nice: dpkg has a circular dependency on itself. Its configure

View file

@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz";
};
patches = [ ./makefile.patch ];
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;
preInstall = ''
mkdir -p $out/{bin,share/man/man8}
'';
meta = with stdenv.lib; {
inherit version;
description = "Recover files based on their contents";
@ -26,14 +36,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
patches = [ ./makefile.patch ];
makeFlags = "PREFIX=$(out)";
enableParallelBuilding = true;
preInstall = ''
mkdir -p $out/{bin,share/man/man8}
'';
}

View file

@ -19,7 +19,7 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
installFlags = "DESTDIR=$(out)";
installFlags = [ "DESTDIR=$(out)" ];
meta = with stdenv.lib; {
inherit version;

View file

@ -11,6 +11,10 @@ stdenv.mkDerivation {
owner = "theZiz";
};
makeFlags = [ "PREFIX=$(out)" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
inherit version;
description = "ANSI HTML Adapter";
@ -22,8 +26,4 @@ stdenv.mkDerivation {
platforms = platforms.linux;
maintainers = with maintainers; [ nckx ];
};
makeFlags = "PREFIX=$(out)";
enableParallelBuilding = true;
}