diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/subsurface/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/subsurface/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/nixpkgs/pkgs/applications/misc/subsurface/default.nix index d8773240bac1..51d015c6e410 100644 --- a/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -27,7 +27,7 @@ let enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = with maintainers; [ mguentner ]; @@ -63,7 +63,7 @@ let enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "QtLocation plugin for Google maps tile API"; maintainers = with maintainers; [ orivej ]; @@ -84,18 +84,16 @@ in stdenv.mkDerivation { qtbase qtconnectivity qtsvg qttools qtwebkit ]; - nativeBuildInputs = [ cmake wrapQtAppsHook pkgconfig ]; + nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; cmakeFlags = [ "-DLIBDC_FROM_PKGCONFIG=ON" "-DNO_PRINTING=OFF" ]; - enableParallelBuilding = true; - passthru = { inherit version libdc googlemaps; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A divelog program"; longDescription = '' Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. |