diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/applications/misc/merkaartor/default.nix | |
parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/merkaartor/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/merkaartor/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/misc/merkaartor/default.nix b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix index eda540427bbd..c8ac515571c7 100644 --- a/nixpkgs/pkgs/applications/misc/merkaartor/default.nix +++ b/nixpkgs/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 |