diff options
| author | William A. Kennington III <william@wkennington.com> | 2013-11-28 02:58:06 -0600 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2013-11-29 02:08:53 -0600 |
| commit | 96dc58db9c6a6c25b164b6d0888deddc57bc7216 (patch) | |
| tree | 9b63e1a3b83d6ce915ebf0fcc0f39df3407b137d /pkgs/os-specific/linux/libselinux | |
| parent | 3f449b8ae67e3098fb42ad58f1cd038c8a7220c9 (diff) | |
| download | nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.gz nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.bz2 nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.lz nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.xz nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.tar.zst nixpkgs-96dc58db9c6a6c25b164b6d0888deddc57bc7216.zip | |
Upgrade selinux from 20100904 -> 20131030
Diffstat (limited to 'pkgs/os-specific/linux/libselinux')
| -rw-r--r-- | pkgs/os-specific/linux/libselinux/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 01935e76632..2dd5bdfb24c 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libselinux-${version}"; - version = "2.1.12"; + version = "2.2.1"; inherit (libsepol) se_release se_url; src = fetchurl { @@ -16,30 +16,22 @@ stdenv.mkDerivation rec { sha256 = "17navgvljgq35bljzcdwjdj3khajc27s15binr51xkp0h29qgbcd"; }; - patch_src = fetchurl { - url = "http://dev.gentoo.org/~swift/patches/libselinux/patchbundle-${name}-r2.tar.gz"; - sha256 = "08zaas8iwyf4w9ll1ylyv4gril1nfarckd5h1l53563sxzyf7dqh"; - }; - - patches = [ ./fPIC.patch ]; # libsemanage seems to need -fPIC everywhere - buildInputs = [ pkgconfig libsepol pcre ] ++ optionals enablePython [ swig python ]; - prePatch = '' - tar xvf ${patch_src} - for p in gentoo-patches/*.patch; do - patch -p1 < "$p" - done - ''; - postPatch = optionalString enablePython '' sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile ''; - installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" "LIBSEPOLDIR=${libsepol}" ]; + installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" ]; installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; + # TODO: Figure out why the build incorrectly links libselinux.so + postInstall = '' + rm $out/lib/libselinux.so + ln -s libselinux.so.1 $out/lib/libselinux.so + ''; + meta = { inherit (libsepol.meta) homepage platforms maintainers; }; |