Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

1 files changed, 9 insertions, 3 deletions

diff --git a/nixpkgs/pkgs/development/web/kore/default.nix b/nixpkgs/pkgs/development/web/kore/default.nix
index 878737ce706f..13caf0e781fc 100644
--- a/nixpkgs/pkgs/development/web/kore/default.nix
+++ b/nixpkgs/pkgs/development/web/kore/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }:
 
+
 stdenv.mkDerivation rec {
   pname = "kore";
   version = "4.2.3";
@@ -27,9 +28,14 @@ stdenv.mkDerivation rec {
     make platform.h
   '';
 
-  # added to fix build w/gcc7 and clang5
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"
-    + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";
+  env.NIX_CFLAGS_COMPILE = toString ([
+    "-Wno-error=deprecated-declarations"
+  ] ++ lib.optionals stdenv.cc.isGNU [
+    "-Wno-error=pointer-compare"
+    "-Wno-error=discarded-qualifiers"
+  ] ++ lib.optionals stdenv.cc.isClang [
+    "-Wno-error=incompatible-pointer-types-discards-qualifiers"
+  ]);
 
   enableParallelBuilding = true;