Skip to content

Commit

Permalink
Merge pull request #37922 from xeji/p/libselinux-i686
Browse files Browse the repository at this point in the history
libsepol,libselinux: fix i686 build
  • Loading branch information
dtzWill committed Mar 27, 2018
2 parents dddf031 + 9df1ad5 commit ee28e35
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/libselinux/default.nix
Expand Up @@ -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
'';
Expand Down
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/libsepol/default.nix
Expand Up @@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
makeFlagsArray+=("MAN3DIR=$out/share/man/man3")
'';

NIX_CFLAGS_COMPILE = [ "-Wno-error" ];

passthru = { inherit se_release se_url; };

Expand Down

0 comments on commit ee28e35

Please sign in to comment.