diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-11-26 18:44:44 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-11-26 23:45:31 +0100 |
commit | 2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c (patch) | |
tree | 64bf789924f9b17cf4ab32f75692c0c10ed4f2f6 /pkgs/tools | |
parent | 8fe518e763917f478dc5e76eae7b2aea9c582cad (diff) | |
download | nixlib-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar nixlib-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.gz nixlib-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.bz2 nixlib-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.lz nixlib-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.xz nixlib-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.zst nixlib-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.zip |
Convert some *Flags from strings to lists
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/compression/lz4/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/filesystems/boxfs/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/gparted/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/minissdpd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/netsniff-ng/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/dpkg/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/foremost/default.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/system/stress-ng/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/aha/default.nix | 8 |
9 files changed, 28 insertions, 22 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 0ce7e0e33436..e91fae778fdb 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -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 diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 30bb8d009a06..3c8c1b6e1809 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -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 diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 4cefc8a412f8..be5eb0e66214 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -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 ]; diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 82e26ad85c9d..f99a3de90468 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { buildInputs = [ libnfnetlink ]; - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index e39787a4fbb9..535a96c1db7c 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -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 diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 2357ec77f122..680a8ef1bda0 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -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 diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 0e502edc2893..af28565f4661 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -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} - ''; } diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 4e6f3ed11e87..12c250788390 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 60114b7b3f3a..152a46cd50c4 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -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; } |