Reverting some changes I brought in by error for util-linux-ng (I was trying their git version, to check some bugfixes they did for my reports).

svn path=/nixpkgs/branches/stdenv-updates/; revision=18880

pkgs/os-specific/linux/util-linux-ng/default.nix

···
-{ stdenv, fetchurl, ncurses ? null, autoconf, libtool, automake,
-gettext, cvs, pkgconfig, ... }:
+{ stdenv, fetchurl, ncurses ? null, ... }:
 
 stdenv.mkDerivation rec {
   name = "util-linux-ng-2.16.2";
-
-#  src = fetchurl {
-#    url = "mirror://kernel/linux/utils/util-linux-ng/v2.16/${name}.tar.bz2";
-#    sha256 = "1sx3z64z8z95v93k0c9lczcp04zw4nm3d2rkhczkyxcpdfcgbhxi";
-#  };
 
   src = fetchurl {
-     url = "file:///home/llbatlle/arm/stdenv-updates/util-linux-ng.tar.gz";
-     sha256 = "07ichlan4jqrcz13ldbcrwqn8z28fmj0jz7k4naf1ajyk1l9m4h1";
+    url = "mirror://kernel/linux/utils/util-linux-ng/v2.16/${name}.tar.bz2";
+    sha256 = "1sx3z64z8z95v93k0c9lczcp04zw4nm3d2rkhczkyxcpdfcgbhxi";
   };
 
   configureFlags = ''
···
     ${if ncurses == null then "--without-ncurses" else ""}
   '';
 
-  buildNativeInputs = [ autoconf libtool automake gettext pkgconfig cvs ];
   buildInputs = stdenv.lib.optional (ncurses != null) ncurses;
 
   # !!! It would be better to obtain the path to the mount helpers
···
   preConfigure = ''
     substituteInPlace mount/mount.c --replace /sbin/mount. /var/run/current-system/sw/sbin/mount.
     substituteInPlace mount/umount.c --replace /sbin/umount. /var/run/current-system/sw/sbin/umount.
-    sh autogen.sh
-    autoreconf -vfi
   '';
 
 }

pkgs/top-level/all-packages.nix

···
   utillinuxCurses = utillinuxngCurses;
 
   utillinuxng = makeOverridable (import ../os-specific/linux/util-linux-ng) {
-    inherit fetchurl stdenv autoconf libtool automake gettext cvs pkgconfig;
+    inherit fetchurl stdenv;
   };
 
   utillinuxngCurses = utillinuxng.override {