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

subsurface: 4.5.6 -> 4.5.97 (beta 2)

Browse Source 
Signed-off-by: Maximilian Güntner <code@klandest.in>
This commit is contained in:
Maximilian Güntner 2017-01-02 02:45:24 +01:00
parent 7e87be4055
commit b00516ca31
No known key found for this signature in database
GPG Key ID: 96126664034A9D85
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,15 +20,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.5.6"; version = "4.5.97";
name = "subsurface-${version}"; name = "subsurface-${version}";
# use fetchgit instead of the official tgz is not complete
src = fetchgit { src = fetchgit {
sha256 = "156rqcszy0c4plk2mv7wdd4h7s7mygpq5sdc64pjfs4qvvsdj10f"; sha256 = "0mbf8m5sbimbyvlh65sjlydrycr4ssfyfzdlqyl0wcpzw7h0qfp8";
url = "git://git.subsurface-divelog.org/subsurface"; url = "git://git.subsurface-divelog.org/subsurface";
rev = "4d8d7c2a0fa1b4b0e6953d92287c75b6f97472d0"; rev = "5f15ad5a86ada3c5e574041a5f9d85235322dabb";
branchName = "v4.5-branch"; branchName = "master";
}; };
buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt
@ -43,8 +42,7 @@ stdenv.mkDerivation rec {
marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so) marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so)
cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \ cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \
-DMARBLE_LIBRARIES=$marble_libs \ -DMARBLE_LIBRARIES=$marble_libs \
-DNO_PRINTING=OFF \ -DNO_PRINTING=OFF"
-DUSE_LIBGIT23_API=1"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

7
pkgs/top-level/all-packages.nix
View File

@ -3821,10 +3821,9 @@ in
su-exec = callPackage ../tools/security/su-exec {}; su-exec = callPackage ../tools/security/su-exec {};
subsurface = subsurface = qt55.callPackage ../applications/misc/subsurface {
qt55.callPackage ../applications/misc/subsurface { libdivecomputer = libdivecomputer_ssrf;
libgit2 = pkgs.libgit2_0_23; };
};
sudo = callPackage ../tools/security/sudo { }; sudo = callPackage ../tools/security/sudo { };