Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 9550686be85b70be95967fbfcb4293ad3f44206b
https://github.com/NixOS/nixpkgs/commit/9550686be85b70be95967fbfcb4293ad3f44206b
Author: Peter Hoeg <[email protected]>
Date: 2017-02-11 (Sat, 11 Feb 2017)
Changed paths:
M pkgs/applications/misc/subsurface/default.nix
R pkgs/development/libraries/libdivecomputer/subsurface.nix
R pkgs/development/libraries/libmarble-ssrf/default.nix
M pkgs/top-level/all-packages.nix
Log Message:
-----------
subsurface: 4.5.97 -> 4.6.0 (#22615)
We do a few more things:
- libmarble and libdivecomputer with the subsurface patches have both been
inlined for 2 reasons:
a) nobody else is using these forks
b) they need to be updated in lockstep with subsurface
- instead of building libmarble against qtquick1, we now build using
qtquickcontrols (qtquick2)
- getting rid of qtquick1 also allows us to use the default qt (currently 5.6)
- we get rid of some hacks to deal with library dependencies
- instead of manually overriding various phases, we simply use cmakeFlags to
pass proper parameters
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
