diff options
Diffstat (limited to 'pkgs/tools/networking')
-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 |
4 files changed, 20 insertions, 29 deletions
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; |