···

       
1
       
1
       
 
       
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake

     

       
2
       
2
       
 
       
, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib

     

       
3
       
3
       
-
       
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit

     

       
3
       
3
       
+
       
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite

     

       
4
       
4
       
 
       
}:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
let

     
···

       
32
       
32
       
 
       
  googlemaps = stdenv.mkDerivation rec {

     

       
33
       
33
       
 
       
    name = "googlemaps-${version}";

     

       
34
       
34
       
 
       


     

       
35
       
35
       
-
       
    version = "2017-09-17";

     

       
35
       
35
       
+
       
    version = "2017-12-18";

     

       
36
       
36
       
 
       


     

       
37
       
37
       
 
       
    src = fetchFromGitHub {

     

       
38
       
38
       
 
       
      owner = "vladest";

     

       
39
       
39
       
 
       
      repo = "googlemaps";

     

       
40
       
40
       
-
       
      rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35";

     

       
41
       
41
       
-
       
      sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84";

     

       
40
       
40
       
+
       
      rev = "79f3511d60dc9640de02a5f24656094c8982b26d";

     

       
41
       
41
       
+
       
      sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d";

     

       
42
       
42
       
 
       
    };

     

       
43
       
43
       
 
       


     

       
44
       
44
       
 
       
    nativeBuildInputs = [ qmake ];

     

       
45
       
45
       
 
       


     

       
46
       
46
       
-
       
    buildInputs = [ qtbase qtlocation ];

     

       
46
       
46
       
+
       
    buildInputs = [ qtbase qtlocation libXcomposite ];

     

       
47
       
47
       
 
       


     

       
48
       
48
       
 
       
    pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";

     

       
49
       
49
       
 
       


     

       
50
       
50
       
 
       
    installPhase = ''

     

       
51
       
51
       
-
       
      mkdir $out $(dirname ${pluginsSubdir})

     

       
52
       
52
       
-
       
      mv plugins ${pluginsSubdir}

     

       
51
       
51
       
+
       
      mkdir -p $out $(dirname ${pluginsSubdir})

     

       
52
       
52
       
+
       
      mkdir -p ${pluginsSubdir}

     

       
53
       
53
       
+
       
      mv *.so ${pluginsSubdir}

     

       
53
       
54
       
 
       
      mv lib $out/

     

       
54
       
55
       
 
       
    '';

     

       
55
       
56