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
This commit is contained in:
@@ -1,25 +0,0 @@
|
||||
{ stdenv, fetchgit, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libdivecomputer-${version}";
|
||||
version = "ssrf-0.5.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://subsurface-divelog.org/libdc";
|
||||
rev = "534dd2f34b8271b2a1cac0e3151bfdc81da40e47";
|
||||
branchName = "Subsurface-branch";
|
||||
sha256 = "0iw9pczmwqlfjlgrik79b2pd4lmipxhjzj60ysk8qzl3axadjycp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.libdivecomputer.org;
|
||||
description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
|
||||
maintainers = [ maintainers.mguentner ];
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user