From ffa178268892d668f4162a5c66c426476800acfe Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 31 Jul 2015 12:40:00 -0700 Subject: [PATCH] libsepol: 2.3 -> 2.4 --- pkgs/os-specific/linux/libsepol/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 29b6d80445a..0417bf59cfa 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, flex }: stdenv.mkDerivation rec { name = "libsepol-${version}"; - version = "2.3"; - se_release = "20140506"; + version = "2.4"; + se_release = "20150202"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; - sha256 = "13z6xakc2qqyhlvnc5h53jy7lqmh5b5cnpfn51lmvfdpqd18d3fc"; + sha256 = "0ncnwhpc1gx4hrrb822fqkwy5h75zzngsrfkd5mlqh1jk7aib419"; }; - preBuild = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" ''; + nativeBuildInputs = [ flex ]; - # TODO: Figure out why the build incorrectly links libsepol.so - postInstall = '' - rm $out/lib/libsepol.so - ln -s libsepol.so.1 $out/lib/libsepol.so + preBuild = '' + makeFlagsArray+=("PREFIX=$out") + makeFlagsArray+=("DESTDIR=$out") ''; passthru = { inherit se_release se_url; };