diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-22 13:48:35 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-22 13:48:35 +0100 |
commit | 0957359568389f4abca5d4176749cac736e7fe6f (patch) | |
tree | 1c8d664ae5405cb2859a2e679e402dca0e597b5b /pkgs/tools | |
parent | 542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9 (diff) | |
parent | 3317eef08420a1561fc42cd97d28fc3eca8c15d7 (diff) | |
download | nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.gz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.bz2 nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.lz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.xz nixlib-0957359568389f4abca5d4176749cac736e7fe6f.tar.zst nixlib-0957359568389f4abca5d4176749cac736e7fe6f.zip |
Merge branch 'staging'
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/runzip/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/misc/mdbtools/git.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/misc/riemann-c-client/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/xclip/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/biosdevname/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/networking/driftnet/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/networking/mu/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/networking/par2cmdline/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/recode/default.nix | 10 |
10 files changed, 49 insertions, 72 deletions
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix index 9b2fd0eda594..1ed453f0d4f8 100644 --- a/pkgs/tools/archivers/runzip/default.nix +++ b/pkgs/tools/archivers/runzip/default.nix @@ -1,21 +1,20 @@ -{stdenv, fetchFromGitHub, libzip, autoconf, automake, libtool, m4}: +{ stdenv, fetchFromGitHub, libzip, autoreconfHook }: + stdenv.mkDerivation rec { - baseName = "runzip"; version = "1.4"; - name = "${baseName}-${version}"; - buildInputs = [libzip autoconf automake libtool m4]; + name = "runzip-${version}"; + + buildInputs = [ libzip autoreconfHook ]; + src = fetchFromGitHub { owner = "vlm"; repo = "zip-fix-filename-encoding"; rev = "v${version}"; sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07"; }; - preConfigure = '' - autoreconf -iv - ''; + meta = { - inherit version; - description = ''A tool to convert filename encoding inside a ZIP archive''; + description = "A tool to convert filename encoding inside a ZIP archive"; license = stdenv.lib.licenses.bsd2 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index cb561e8172fe..d6534fc5ee61 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, texinfo, buggyBiosCDSupport ? true}: +{stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}: stdenv.mkDerivation { name = "grub-0.97-patch-1.12"; @@ -33,8 +33,8 @@ stdenv.mkDerivation { ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch); - # Autoconf/automake required for the splashimage patch. - buildInputs = [autoconf automake texinfo]; + # autoreconfHook required for the splashimage patch. + buildInputs = [ autoreconfHook texinfo ]; prePatch = '' unpackFile $gentooPatches @@ -45,11 +45,6 @@ stdenv.mkDerivation { done ''; - preConfigure = '' - autoreconf - automake --add-missing - ''; - passthru.grubTarget = ""; meta = { diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 8cf5e5e9a38d..777fc7bfd16d 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, - scrollkeeper}: +{ stdenv, fetchgit, glib, readline, bison, flex, pkgconfig, + libiconv, autoreconfHook, which, txt2man, gnome_doc_utils, scrollkeeper }: stdenv.mkDerivation { name = "mdbtools-git-2014-07-25"; @@ -12,16 +11,18 @@ stdenv.mkDerivation { }; buildInputs = [ - glib readline bison flex pkgconfig autoconf automake - libtool which txt2man gnome_doc_utils scrollkeeper libiconv + glib readline bison flex autoreconfHook pkgconfig which txt2man + gnome_doc_utils scrollkeeper libiconv ]; + preAutoreconf = '' + sed -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)' \ + -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)' \ + -i configure.ac + ''; + preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c - sed -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)' \ - -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)' \ - -i configure.ac - autoreconf -i -f ''; meta = { diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 5dde592aade2..eb8e17a86938 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, file -, protobufc }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { name = "riemann-c-client-${version}"; @@ -13,9 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0jc2bbw7sp2gr4cswx78srs0p1kp81prcarq4ivqpfw4bmzg6xg4"; }; - buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; - - preConfigure = "autoreconf -i"; + buildInputs = [ autoreconfHook pkgconfig file protobufc ]; meta = with stdenv.lib; { homepage = https://github.com/algernon/riemann-c-client; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 3f616fdad681..e0ad4bbab5fd 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoconf, automake, libtool }: +{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoreconfHook }: stdenv.mkDerivation rec { # The last release from 2012, 0.12, lacks '-targets' @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0d6r38xas5l79l700sdm14l41vvjqhah613367ha8kcvx54zkddz"; }; - preConfigure = "autoreconf -vfi"; + buildInputs = [ xlibsWrapper libXmu autoreconfHook ]; - buildInputs = [ xlibsWrapper libXmu autoconf automake libtool ]; - - meta = { + meta = { description = "Tool to access the X clipboard from a console application"; homepage = http://sourceforge.net/projects/xclip/; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index 86fe18e01583..f39f37453551 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -1,10 +1,9 @@ -{stdenv, fetchgit, automake, autoconf, zlib, pciutils}: -let - version = "0.6.1"; -in -stdenv.mkDerivation { +{ stdenv, fetchgit, autoreconfHook, zlib, pciutils }: + +stdenv.mkDerivation rec { name = "biosdevname-${version}"; - + version = "0.6.1"; + src = fetchgit { url = git://linux.dell.com/biosdevname.git; rev = "refs/tags/v${version}"; @@ -12,16 +11,11 @@ stdenv.mkDerivation { }; buildInputs = [ - automake - autoconf + autoreconfHook zlib pciutils ]; - preConfigure = '' - autoreconf -i - ''; - # Don't install /lib/udev/rules.d/*-biosdevname.rules patches = [ ./makefile.patch ]; diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 83a26f98d8b6..6666612419d9 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libpcap, libjpeg, libungif, libpng, giflib, glib, gtk2, cairo, pango, gdk_pixbuf, atk, pkgconfig }: +{ stdenv, lib, fetchFromGitHub, libpcap, libjpeg , libungif, libpng +, giflib, glib, gtk2, cairo, pango, gdk_pixbuf, atk +, pkgconfig, autoreconfHook }: with lib; @@ -6,9 +8,10 @@ stdenv.mkDerivation rec { name = "driftnet-${stdenv.lib.strings.substring 0 7 rev}"; rev = "8d47fd563a06122d4a6f9b9b9d27ba3d635148c0"; - buildInputs = [ autoconf automake pkgconfig libpcap libjpeg libungif libpng giflib glib gtk2 glib cairo pango gdk_pixbuf atk ]; - - preConfigure = "autoreconf -fi"; + buildInputs = [ + pkgconfig libpcap libjpeg libungif libpng giflib + glib gtk2 glib cairo pango gdk_pixbuf atk autoreconfHook + ]; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 1191129894c1..77ef86baec36 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, sqlite, pkgconfig, autoconf, automake +{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook , xapian, glib, gmime, texinfo , emacs, guile , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: @@ -11,14 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51"; }; - buildInputs = - [ sqlite pkgconfig autoconf automake xapian - glib gmime texinfo emacs guile libsoup icu ] - ++ stdenv.lib.optionals withMug [ gtk3 webkit ]; - - preConfigure = '' - autoreconf -i - ''; + buildInputs = [ + sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu + autoreconfHook + ] ++ stdenv.lib.optionals withMug [ gtk3 webkit ]; preBuild = '' # Fix mu4e-builddir (set it to $out) diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 68f1f7632971..94b9f3bdc7c2 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip, autoconf, automake}: +{ stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { name = "par2cmdline-${version}"; @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0maywssv468ia7rf8jyq4axwahgli3nfykl7x3zip503psywjj8a"; }; - buildInputs = [ autoconf automake ]; - - preConfigure = "autoreconf"; + buildInputs = [ autoreconfHook ]; meta = { homepage = https://github.com/BlackIkeEagle/par2cmdline; diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 004a93f6ebdd..4ea2631bcb72 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex, +{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook, texinfo, libiconv }: stdenv.mkDerivation rec { @@ -11,17 +11,13 @@ stdenv.mkDerivation rec { sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03"; }; - nativeBuildInputs = [ python perl autoconf automake libtool intltool flex texinfo - libiconv ]; + nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ]; - preConfigure = '' + preAutoreconf = '' # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455 - #rm acinclude.m4 substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" "" sed -i '/^AM_C_PROTOTYPES/d' configure.ac substituteInPlace src/Makefile.am --replace "ansi2knr" "" - - autoreconf -fi '' + stdenv.lib.optionalString stdenv.isDarwin '' export LDFLAGS=-lintl |