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/development/ruby-modules | |
parent | ccc8c73ea00321318e9ac2cb75879f57bef328a7 (diff) | |
parent | e7297363c95415aa2376130583d6c74a85714ab5 (diff) |
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/development/ruby-modules')
-rw-r--r-- | pkgs/development/ruby-modules/gem-config/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 7f6ca505fc11..68c2011205ae 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -242,7 +242,20 @@ in nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=stringop-overflow" + "-Wno-error=implicit-fallthrough" + "-Wno-error=sizeof-pointer-memaccess" + "-Wno-error=cast-function-type" + "-Wno-error=class-memaccess" + "-Wno-error=ignored-qualifiers" + "-Wno-error=tautological-compare" + ]; + dontBuild = false; + postPatch = '' + substituteInPlace Makefile \ + --replace '-Wno-invalid-source-encoding' "" + ''; }; hitimes = attrs: { |