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

subsurface: fix compilation with Qt 5.10

Browse Source
This commit is contained in:
Bastian Köcher 2018-01-01 18:28:49 +01:00 committed by Yegor Timoshenko
parent f448a79770
commit d9e26a08b9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake
, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib , curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
}: }:
let let
@ -32,24 +32,25 @@ let
googlemaps = stdenv.mkDerivation rec { googlemaps = stdenv.mkDerivation rec {
name = "googlemaps-${version}"; name = "googlemaps-${version}";
version = "2017-09-17"; version = "2017-12-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vladest"; owner = "vladest";
repo = "googlemaps"; repo = "googlemaps";
rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35"; rev = "79f3511d60dc9640de02a5f24656094c8982b26d";
sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84"; sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d";
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtlocation ]; buildInputs = [ qtbase qtlocation libXcomposite ];
pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
installPhase = '' installPhase = ''
mkdir $out $(dirname ${pluginsSubdir}) mkdir -p $out $(dirname ${pluginsSubdir})
mv plugins ${pluginsSubdir} mkdir -p ${pluginsSubdir}
mv *.so ${pluginsSubdir}
mv lib $out/ mv lib $out/
''; '';