diff options
| author | Nikolay Korotkiy <sikmir@disroot.org> | 2023-08-07 23:08:25 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-07 23:08:25 +0400 |
| commit | be2d16515df0dd64602ff9d478945a0dfe67ae6e (patch) | |
| tree | f4c0e064af770ef9ad216fa378d2e87f8f3f9892 /pkgs | |
| parent | 596edc6d3c6d89812dcae919029bc46fadf25ac9 (diff) | |
| parent | c35ae8c34f689a3cdd1c8507410f79714493f69c (diff) | |
| download | nixlib-be2d16515df0dd64602ff9d478945a0dfe67ae6e.tar nixlib-be2d16515df0dd64602ff9d478945a0dfe67ae6e.tar.gz nixlib-be2d16515df0dd64602ff9d478945a0dfe67ae6e.tar.bz2 nixlib-be2d16515df0dd64602ff9d478945a0dfe67ae6e.tar.lz nixlib-be2d16515df0dd64602ff9d478945a0dfe67ae6e.tar.xz nixlib-be2d16515df0dd64602ff9d478945a0dfe67ae6e.tar.zst nixlib-be2d16515df0dd64602ff9d478945a0dfe67ae6e.zip | |
Merge pull request #247774 from wegank/merkaartor-exiv2
merkaartor: add patch for exiv2 0.28
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/merkaartor/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index eda540427bbd..c8ac515571c7 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -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 |