public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37922 from xeji/p/libselinux-i686 

libsepol,libselinux: fix i686 build
This commit is contained in:
Will Dietz 2018-03-27 14:41:44 -05:00 committed by GitHub
parent dddf0314bc 9df1ad5a2d
commit ee28e35ba3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/libselinux/default.nix
View File

@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
# command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
hardeningDisable = [ "fortify" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
postPatch = optionalString enablePython ''
sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile
'';

1
pkgs/os-specific/linux/libsepol/default.nix
View File

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
'';
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
passthru = { inherit se_release se_url; };