diff options
| author | Josef Kemetmueller <josef.kemetmueller@aon.at> | 2016-11-13 16:15:45 +0100 |
|---|---|---|
| committer | Christoph Hrdinka <c.github@hrdinka.at> | 2016-11-15 17:33:31 +0100 |
| commit | 334a1a6f8ae550aa43c2562ee0f8abbbdea61548 (patch) | |
| tree | f3e89927d286f42f3ba7d7b4965de5b04db3526a /pkgs/development/libraries/icu | |
| parent | c2b9404c02e567b163d62cfdc7f24f1b19e79680 (diff) | |
| download | nixpkgs-334a1a6f8ae550aa43c2562ee0f8abbbdea61548.tar nixpkgs-334a1a6f8ae550aa43c2562ee0f8abbbdea61548.tar.gz nixpkgs-334a1a6f8ae550aa43c2562ee0f8abbbdea61548.tar.bz2 nixpkgs-334a1a6f8ae550aa43c2562ee0f8abbbdea61548.tar.lz nixpkgs-334a1a6f8ae550aa43c2562ee0f8abbbdea61548.tar.xz nixpkgs-334a1a6f8ae550aa43c2562ee0f8abbbdea61548.tar.zst nixpkgs-334a1a6f8ae550aa43c2562ee0f8abbbdea61548.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/icu')
| -rw-r--r-- | pkgs/development/libraries/icu/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index a7bf4af99fb..ba8fe038ffa 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; |