From 9e7021c97d9a3bb5901fb397385c66f9308dd2d1 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 12 Nov 2017 12:34:53 +0100 Subject: json-c*: fixup build with gcc-7 (ignore warning) --- pkgs/development/libraries/json-c/0.11.nix | 3 +++ pkgs/development/libraries/json-c/default.nix | 3 +++ 2 files changed, 6 insertions(+) (limited to 'pkgs/development/libraries/json-c') diff --git a/pkgs/development/libraries/json-c/0.11.nix b/pkgs/development/libraries/json-c/0.11.nix index 029921ee08c0b..8c4eab9ede6e1 100644 --- a/pkgs/development/libraries/json-c/0.11.nix +++ b/pkgs/development/libraries/json-c/0.11.nix @@ -6,6 +6,9 @@ stdenv.mkDerivation rec { url = "https://github.com/json-c/json-c/archive/json-c-0.11-20130402.tar.gz"; sha256 = "1m8fy7lbahv1r7yqbhw4pl057sxmmgjihm1fsvc3h66710s2i24r"; }; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + meta = with stdenv.lib; { description = "A JSON implementation in C"; homepage = https://github.com/json-c/json-c/wiki; diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index b8c72d9669e07..7317efc53f862 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # won't configure without it, no idea why + # probably OK after update: https://github.com/json-c/json-c/pull/365 + NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; + # compatibility hack (for mypaint at least) postInstall = '' ln -s json-c.pc "$dev/lib/pkgconfig/json.pc" -- cgit 1.4.1