diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index a7bc747c723..3ab1c580837 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -1,17 +1,11 @@ -{ 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 = '' @@ -19,7 +13,6 @@ stdenv.mkDerivation rec { ${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 @@ -29,8 +22,6 @@ stdenv.mkDerivation rec { 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 ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 386b36ba29d..4d4f3530bfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6098,7 +6098,7 @@ let 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 {