ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Fix icu4c expression for latest gcc (fixes #2341)"

Browse Source 
This reverts commit d393c6c538.
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.
This commit is contained in:
Josef Kemetmueller 2016-11-13 16:15:45 +01:00 committed by Christoph Hrdinka
parent c2b9404c02
commit 334a1a6f8a
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/icu/default.nix
View File

@ -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;