Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 334a1a6f8ae550aa43c2562ee0f8abbbdea61548
https://github.com/NixOS/nixpkgs/commit/334a1a6f8ae550aa43c2562ee0f8abbbdea61548
Author: Josef Kemetmueller <[email protected]>
Date: 2016-11-15 (Tue, 15 Nov 2016)
Changed paths:
M pkgs/development/libraries/icu/default.nix
Log Message:
-----------
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.
Commit: 80eafb39e140b64f1366b26f5aa210ae2d80e68a
https://github.com/NixOS/nixpkgs/commit/80eafb39e140b64f1366b26f5aa210ae2d80e68a
Author: Josef Kemetmueller <[email protected]>
Date: 2016-11-15 (Tue, 15 Nov 2016)
Changed paths:
M pkgs/development/libraries/mapnik/default.nix
Log Message:
-----------
mapnik: Make dependencies explicit for SCons
This is necessary to fix the build for (at least) darwin. If the
arguments are not specified explicitly then homebrew-install locations
are assumed for at least "icu".
Closes #20395.
Compare: https://github.com/NixOS/nixpkgs/compare/c2b9404c02e5...80eafb39e140_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
