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

@@ -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;
}