diff options
author | Bastian Köcher <bkchr@users.noreply.github.com> | 2018-01-01 18:28:49 +0100 |
---|---|---|
committer | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2018-01-01 20:28:49 +0300 |
commit | d9e26a08b9e1876e1d3dfd0c6223bfe566593a82 (patch) | |
tree | c6fe6ec910da0392c6d1e34e5d854c25820a4ee2 /pkgs/applications/misc/subsurface | |
parent | f448a79770db137448f12236fc10719ef7389abd (diff) | |
download | nixpkgs-d9e26a08b9e1876e1d3dfd0c6223bfe566593a82.tar nixpkgs-d9e26a08b9e1876e1d3dfd0c6223bfe566593a82.tar.gz nixpkgs-d9e26a08b9e1876e1d3dfd0c6223bfe566593a82.tar.bz2 nixpkgs-d9e26a08b9e1876e1d3dfd0c6223bfe566593a82.tar.lz nixpkgs-d9e26a08b9e1876e1d3dfd0c6223bfe566593a82.tar.xz nixpkgs-d9e26a08b9e1876e1d3dfd0c6223bfe566593a82.tar.zst nixpkgs-d9e26a08b9e1876e1d3dfd0c6223bfe566593a82.zip |
subsurface: fix compilation with Qt 5.10
Diffstat (limited to 'pkgs/applications/misc/subsurface')
-rw-r--r-- | pkgs/applications/misc/subsurface/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index aaf2f488c38..376ea9e293a 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake , curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib -, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit +, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: let @@ -32,24 +32,25 @@ let googlemaps = stdenv.mkDerivation rec { name = "googlemaps-${version}"; - version = "2017-09-17"; + version = "2017-12-18"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35"; - sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84"; + rev = "79f3511d60dc9640de02a5f24656094c8982b26d"; + sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d"; }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtlocation ]; + buildInputs = [ qtbase qtlocation libXcomposite ]; pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; installPhase = '' - mkdir $out $(dirname ${pluginsSubdir}) - mv plugins ${pluginsSubdir} + mkdir -p $out $(dirname ${pluginsSubdir}) + mkdir -p ${pluginsSubdir} + mv *.so ${pluginsSubdir} mv lib $out/ ''; |