dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #247774 from wegank/merkaartor-exiv2

Browse Source 
merkaartor: add patch for exiv2 0.28
This commit is contained in:
Nikolay Korotkiy 2023-08-07 23:08:25 +04:00 committed by GitHub
commit be2d16515d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/misc/merkaartor/default.nix
View File

@ -1,9 +1,10 @@
{ mkDerivation
, lib
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, qmake
, qttools
, wrapQtAppsHook
, qttranslations
, gdal
, proj
@ -15,7 +16,7 @@
, withZbar ? false, zbar
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "merkaartor";
version = "0.19.0";
@ -23,10 +24,18 @@ mkDerivation rec {
owner = "openstreetmap";
repo = "merkaartor";
rev = version;
sha256 = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ=";
hash = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ=";
};
nativeBuildInputs = [ qmake qttools ];
patches = [
(fetchpatch {
name = "exiv2-0.28.patch";
url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch";
hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo=";
})
];
nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
buildInputs = [ gdal proj qtsvg qtwebengine ]
++ lib.optional withGeoimage exiv2