treewide: Make all the rest of configureFlags

2018-08-03 17:06:03 -04:00
parent f92ed87372
commit f0d6b385d1
19 changed files with 49 additions and 30 deletions
@@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
    sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
  '';

-  configureFlags = if stdenv.cc.isClang
-    then [ "--disable-werror" ] else null;
+  configureFlags = stdenv.lib.optional stdenv.cc.isClang "--disable-werror";

  CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h