diff options
author | Arnout Engelen <arnout@bzzt.net> | 2020-11-20 14:54:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-20 14:54:14 +0100 |
commit | 70ecb218f1d12ee4825d1c511573be51038af70b (patch) | |
tree | b01b25b594dcbe12d34599a7abd38d189e631fe1 /pkgs/os-specific/linux/libselinux | |
parent | cbb4e4733bf2641e75ddf84578d273be99a33824 (diff) |
selinux: 2.9 -> 3.0 (#104087)
Notably, Python 2 code is not be supported in this project anymore and new Python code should be written only for Python 3, which is no longer restricted to Python 3.7 (see 780fb563c74171aafc2fb802cfdebd56a68d0705, 5dfd3c497540bb172ff0d04cc8eb5ecbeb59b938) https://github.com/SELinuxProject/selinux/releases/tag/20191204
Diffstat (limited to 'pkgs/os-specific/linux/libselinux')
-rw-r--r-- | pkgs/os-specific/linux/libselinux/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 741c51e2233b8..4dfd6a3f2cd6d 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl, pcre, pkgconfig, libsepol -, enablePython ? true, swig ? null, python ? null +, enablePython ? true, swig ? null, python3 ? null , fts }: -assert enablePython -> swig != null && python != null; +assert enablePython -> swig != null && python3 != null; with stdenv.lib; stdenv.mkDerivation rec { pname = "libselinux"; - version = "2.9"; + version = "3.0"; inherit (libsepol) se_release se_url; outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py"; src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; - sha256 = "14r69mgmz7najf9wbizvp68q56mqx4yjbkxjlbcqg5a47s3wik0v"; + sha256 = "0cr4p0qkr4qd5z1x677vwhz6mlz55kxyijwi2dmrvbhxcw7v78if"; }; - nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python ]; - buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python ]; + nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python3 ]; + buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python3 ]; # drop fortify here since package uses it by default, leading to compile error: # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] @@ -35,14 +35,18 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" - "PYTHON=${python.pythonForBuild}/bin/python" - "PYTHONLIBDIR=$(py)/${python.sitePackages}" + "PYTHON=${python3.pythonForBuild}/bin/python" + "PYTHONLIBDIR=$(py)/${python3.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" ]; + preInstall = '' + mkdir -p $py/${python3.sitePackages}/selinux + ''; + installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; meta = removeAttrs libsepol.meta ["outputsToInstall"] // { |