From 1cdaba0c7442d8b8185c218dc464434e67e9148c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Jan 2019 12:24:58 +0100 Subject: gnuapl: fix build with gcc8 --- pkgs/development/interpreters/gnu-apl/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index f60e5d286140..39a2f507e630 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -11,9 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; - # Needed with GCC 7 - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=int-in-bool-context" - + stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=null-dereference"; + # Needed with GCC 8 + NIX_CFLAGS_COMPILE = with stdenv.lib; (optionals stdenv.cc.isGNU [ + "-Wno-error=int-in-bool-context" + "-Wno-error=class-memaccess" + "-Wno-error=restrict" + "-Wno-error=format-truncation" + ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" -- cgit 1.4.1