Branch: refs/heads/release-16.09
Home: https://github.com/NixOS/nixpkgs
Commit: 06c7e7126cc9bb6e1c14fb6bb2e799f2d0d94436
https://github.com/NixOS/nixpkgs/commit/06c7e7126cc9bb6e1c14fb6bb2e799f2d0d94436
Author: Christoph Hrdinka <c.git...@hrdinka.at>
Date: 2016-11-15 (Tue, 15 Nov 2016)
Changed paths:
M pkgs/development/libraries/mapnik/default.nix
Log Message:
-----------
mapnik: 3.0.10 -> 3.0.12
Commit: 1f1615e12878ccac7bd7abb941f7e402e5e544a1
https://github.com/NixOS/nixpkgs/commit/1f1615e12878ccac7bd7abb941f7e402e5e544a1
Author: Josef Kemetmueller <josef.kemetmuel...@aon.at>
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: 1e105b2da3d6fef2105b14e3260010c76ed1a0de
https://github.com/NixOS/nixpkgs/commit/1e105b2da3d6fef2105b14e3260010c76ed1a0de
Author: Josef Kemetmueller <josef.kemetmuel...@aon.at>
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/5421df94fd54...1e105b2da3d6
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits