mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-27 23:57:42 +03:00
merkaartor: 0.18.4 → 0.19.0
This commit is contained in:
parent
c988c752bb
commit
224cbafe16
@ -2,14 +2,13 @@
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, qmake
|
||||
, qttools
|
||||
, qttranslations
|
||||
, gdal
|
||||
, proj
|
||||
, qtsvg
|
||||
, qtwebkit
|
||||
, qtwebengine
|
||||
, withGeoimage ? true, exiv2
|
||||
, withGpsdlib ? (!stdenv.isDarwin), gpsd
|
||||
, withLibproxy ? false, libproxy
|
||||
@ -18,31 +17,18 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "merkaartor";
|
||||
version = "0.18.4";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
repo = "merkaartor";
|
||||
rev = version;
|
||||
sha256 = "vwO4/a7YF9KbpxcFGTFCdG6SfwEyhISlEtcA+rMebUA=";
|
||||
sha256 = "sha256-Gx+gnVbSY8JnG03kO5vVQNlSZRl/hrKTdDbh7lyIMbA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with Qt 5.15 (missing QPainterPath include)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch";
|
||||
sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U=";
|
||||
})
|
||||
# Added a condition to use the new timespec_t on gpsd APIs >= 9
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openstreetmap/merkaartor/commit/13b358fa7899bb34e277b32a4c0d92833050f2c6.patch";
|
||||
sha256 = "129fpjm7illz7ngx3shps5ivrxwf14apw55842xhskwwb0rf5szb";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
buildInputs = [ gdal proj qtsvg qtwebkit ]
|
||||
buildInputs = [ gdal proj qtsvg qtwebengine ]
|
||||
++ lib.optional withGeoimage exiv2
|
||||
++ lib.optional withGpsdlib gpsd
|
||||
++ lib.optional withLibproxy libproxy
|
||||
@ -52,8 +38,10 @@ mkDerivation rec {
|
||||
lrelease src/src.pro
|
||||
'';
|
||||
|
||||
qmakeFlags = [ "TRANSDIR_SYSTEM=${qttranslations}/translations" ]
|
||||
++ lib.optional withGeoimage "GEOIMAGE=1"
|
||||
qmakeFlags = [
|
||||
"TRANSDIR_SYSTEM=${qttranslations}/translations"
|
||||
"USEWEBENGINE=1"
|
||||
] ++ lib.optional withGeoimage "GEOIMAGE=1"
|
||||
++ lib.optional withGpsdlib "GPSDLIB=1"
|
||||
++ lib.optional withLibproxy "LIBPROXY=1"
|
||||
++ lib.optional withZbar "ZBAR=1";
|
||||
|
Loading…
Reference in New Issue
Block a user