From d9e26a08b9e1876e1d3dfd0c6223bfe566593a82 Mon Sep 17 00:00:00 2001
From: Bastian Köcher <bkchr@users.noreply.github.com>
Date: Mon, 1 Jan 2018 18:28:49 +0100
Subject: subsurface: fix compilation with Qt 5.10

---
 pkgs/applications/misc/subsurface/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'pkgs/applications/misc/subsurface')

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index aaf2f488c382c..376ea9e293aad 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/
     '';
 
-- 
cgit 1.4.1