diff options
| author | Will Dietz <github@wdtz.org> | 2018-03-27 14:41:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 14:41:44 -0500 |
| commit | ee28e35ba37ab285fc29e4a09f26235ffe4123e2 (patch) | |
| tree | 38393bb0f24291b3e37d85a129ed6966604e57a7 /pkgs/os-specific | |
| parent | dddf0314bc0b08e863628ab756ffe37c20f1985a (diff) | |
| parent | 9df1ad5a2d8eb9a26e394530d3dbd16360de5633 (diff) | |
| download | nixlib-ee28e35ba37ab285fc29e4a09f26235ffe4123e2.tar nixlib-ee28e35ba37ab285fc29e4a09f26235ffe4123e2.tar.gz nixlib-ee28e35ba37ab285fc29e4a09f26235ffe4123e2.tar.bz2 nixlib-ee28e35ba37ab285fc29e4a09f26235ffe4123e2.tar.lz nixlib-ee28e35ba37ab285fc29e4a09f26235ffe4123e2.tar.xz nixlib-ee28e35ba37ab285fc29e4a09f26235ffe4123e2.tar.zst nixlib-ee28e35ba37ab285fc29e4a09f26235ffe4123e2.zip | |
Merge pull request #37922 from xeji/p/libselinux-i686
libsepol,libselinux: fix i686 build
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/libselinux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/libsepol/default.nix | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 4ddc30102212..8dc906b29936 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -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 ''; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 59962e911d42..40872f7c1ac8 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("MAN3DIR=$out/share/man/man3") ''; + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; passthru = { inherit se_release se_url; }; |