WIP: getting better

This commit is contained in:
Vladimír Čunát
2014-08-30 19:11:52 +02:00
parent b8c7091335
commit abbc93f783
9 changed files with 58 additions and 25 deletions

View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
stdenv.mkDerivation rec {
name = "util-linux-2.24.2";
name = "util-linux-2.25";
src = fetchurl {
url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.24/${name}.tar.xz";
sha256 = "1w0g8q5aj5pjdf8l52g0mxyvlk62f4dch51q9jm3hnqwgz0dchqj";
url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.25/${name}.tar.xz";
sha256 = "02lqww6ck4p47wzc883zdjb1gnwm59hsay4hd5i55mfdv25mmfj7";
};
outputs = [ "dev" "out" "bin" ];
outputs = [ "dev" "out" "bin" ]; # ToDo: problems with e2fsprogs
crossAttrs = {
# Work around use of `AC_RUN_IFELSE'.
@@ -37,13 +37,17 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (perl != null) perl;
postInstall = ''
rm $out/bin/su # su should be supplied by the su package (shadow)
sed "s,$out$out,$out,g" -i "$dev"/lib/pkgconfig/*.pc
rm "$bin/bin/su" # su should be supplied by the su package (shadow)
'';
enableParallelBuilding = true;
meta = {
meta = with stdenv.lib; {
homepage = http://www.kernel.org/pub/linux/utils/util-linux/;
description = "A set of system utilities for Linux";
license = licenses.gpl2; # also contains parts under more permissive licenses
platforms = platforms.all;
};
}