public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113676 from adisbladis/subsurface-4_9_10

Browse Source 
subsurface: 4.9.6 -> 4.9.10
This commit is contained in:
adisbladis 2021-02-19 12:02:50 +01:00 committed by GitHub
commit b310f4915d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/subsurface/default.nix
View File

@ -1,16 +1,17 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake { lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake
, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
, bluez
}: }:
let let
version = "4.9.6"; version = "4.9.10";
subsurfaceSrc = (fetchFromGitHub { subsurfaceSrc = (fetchFromGitHub {
owner = "Subsurface"; owner = "Subsurface";
repo = "subsurface"; repo = "subsurface";
rev = "v${version}"; rev = "v${version}";
sha256 = "1w1ak0fi6ljhg2jc4mjqyrbpax3iawrnsaqq6ls7qdzrhi37rggf"; sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs";
fetchSubmodules = true; fetchSubmodules = true;
}); });
@ -84,6 +85,7 @@ in stdenv.mkDerivation {
libdc googlemaps libdc googlemaps
curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip
qtbase qtconnectivity qtsvg qttools qtwebkit qtbase qtconnectivity qtsvg qttools qtwebkit
bluez
]; ];
nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ];
@ -105,7 +107,7 @@ in stdenv.mkDerivation {
''; '';
homepage = "https://subsurface-divelog.org"; homepage = "https://subsurface-divelog.org";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ mguentner ]; maintainers = with maintainers; [ mguentner adisbladis ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }