Merge pull request #21617 from mguentner/subsurface_beta

subsurface 4.5.6 -> 4.5.97

2 files changed, 25 insertions, 27 deletions

diff --git a/pkgs/development/libraries/git2/0.23.nix b/pkgs/development/libraries/git2/0.23.nix
deleted file mode 100644
index 3cf429ab1d7..00000000000
--- a/pkgs/development/libraries/git2/0.23.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }:
-
-stdenv.mkDerivation (rec {
-  version = "0.23.2";
-  name = "libgit2-${version}";
-
-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/libgit2/libgit2/tarball/v${version}";
-    sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp";
-  };
-
-  cmakeFlags = "-DTHREADSAFE=ON";
-
-  nativeBuildInputs = [ cmake python pkgconfig ];
-  buildInputs = [ zlib libssh2 openssl http-parser ];
-
-  meta = {
-    description = "the Git linkable library";
-    homepage = http://libgit2.github.com/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; all;
-  };
-} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
-  NIX_LDFLAGS = "-liconv";
-  propagatedBuildInputs = [ libiconv ];
-})
diff --git a/pkgs/development/libraries/libdivecomputer/subsurface.nix b/pkgs/development/libraries/libdivecomputer/subsurface.nix
new file mode 100644
index 00000000000..5840ea2ef85
--- /dev/null
+++ b/pkgs/development/libraries/libdivecomputer/subsurface.nix
@@ -0,0 +1,25 @@
+{ 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;
+  };
+}