From 185cd2c60ccba33fee1ad16fd28967e0cdffb8ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Nov 2017 10:35:39 +0100
Subject: [PATCH] librevenge: fixup build with gcc-7 (ignore a warning)
---
pkgs/development/libraries/librevenge/default.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix
index 3523eb5c37bc..2c6e792ae8ce 100644
--- a/pkgs/development/libraries/librevenge/default.nix
+++ b/pkgs/development/libraries/librevenge/default.nix
@@ -21,11 +21,10 @@ stdenv.mkDerivation {
inherit (s) url sha256;
};
- # Clang generates warnings in Boost's header files
+ # Clang and gcc-7 generate warnings, and
# -Werror causes these warnings to be interpreted as errors
# Simplest solution: disable -Werror
- configureFlags = if stdenv.cc.isClang
- then [ "--disable-werror" ] else null;
+ configureFlags = [ "--disable-werror" ];
# Fix an issue with boost 1.59
# This is fixed upstream so please remove this when updating