diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
| commit | 5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3 (patch) | |
| tree | c999ad66361e4c4c5d3ad5443bf575422c41150d /pkgs/tools/system | |
| parent | ccc8c73ea00321318e9ac2cb75879f57bef328a7 (diff) | |
| parent | e7297363c95415aa2376130583d6c74a85714ab5 (diff) | |
| download | nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.gz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.bz2 nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.lz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.xz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.zst nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.zip | |
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/facter/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 6b84f7d69a55..ee9cdf361294 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = "-fpermissive -Wno-error=catch-value"; NIX_LDFLAGS = "-lblkid"; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; |