public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverting some changes I brought in by error for util-linux-ng (I was trying

Browse Source 
their git version, to check some bugfixes they did for my reports).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18880
This commit is contained in:
Lluís Batlle i Rossell 2009-12-10 15:05:26 +00:00
parent 99f8d729b0
commit 61a6bdad88
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/util-linux-ng/default.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

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