From deb3dd805f29c73f9d2bed7d3a9f2ab9d96c6509 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 27 Mar 2011 04:45:38 +0000 Subject: libselinux: version bump svn path=/nixpkgs/trunk/; revision=26537 --- pkgs/os-specific/linux/libselinux/builder.sh | 6 ------ pkgs/os-specific/linux/libselinux/default.nix | 15 +++++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 pkgs/os-specific/linux/libselinux/builder.sh (limited to 'pkgs/os-specific/linux/libselinux') diff --git a/pkgs/os-specific/linux/libselinux/builder.sh b/pkgs/os-specific/linux/libselinux/builder.sh deleted file mode 100644 index 673af3dcc7b7..000000000000 --- a/pkgs/os-specific/linux/libselinux/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -export DESTDIR=$out -export PREFIX=$out - -genericBuild diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index e0a02a141960..4be88a20e24a 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,12 +1,15 @@ {stdenv, fetchurl, libsepol}: -stdenv.mkDerivation { - builder = ./builder.sh; - name = "libselinux-1.30"; +stdenv.mkDerivation rec { + name = "libselinux-${version}"; + version = "2.0.98"; + src = fetchurl { - url = http://www.nsa.gov/selinux/archives/libselinux-1.30.tgz; - md5 = "0b7d269c9b7d847059e4b11a710ab404"; + url = "http://userspace.selinuxproject.org/releases/20101221/devel/${name}.tar.gz"; + sha256 = "00irm7nyakgi4z8d6dlm6c70fkbl6rzk5w1w0ny2c564yw0d0dlz"; }; - buildInputs = [libsepol]; + buildInputs = [ libsepol ]; + + preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" ''; } -- cgit 1.4.1