From 334a1a6f8ae550aa43c2562ee0f8abbbdea61548 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sun, 13 Nov 2016 16:15:45 +0100 Subject: [PATCH] Revert "Fix icu4c expression for latest gcc (fixes #2341)" This reverts commit d393c6c53803a6c1d61fa5e58e283aaa4beba7b8. The commit removed C++11 compatibility on darwin by overriding the --std=c++0x flag in CXXFLAGS. Which lead to a failing build of mapnik, which depends on the move constructors being available in the icu-lib. Since it builds fine without the headerpad_max_install_names flag, we simply undo the change that introduced this flag. --- pkgs/development/libraries/icu/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index a7bf4af99fb3..ba8fe038ffac 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation ({ outputs = [ "out" "dev" ]; outputBin = "dev"; - makeFlags = stdenv.lib.optionalString stdenv.isDarwin - "CXXFLAGS=-headerpad_max_install_names"; - # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;