diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-04 09:21:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 09:21:31 +0200 |
| commit | 34d941de42305ab9dbdd3d00c73a6e22e8157495 (patch) | |
| tree | f07abb9dae13c9d418573f68668d758605aa64b5 /pkgs | |
| parent | d478d2c6b66a83bcb58d53923be85bdb1519a85f (diff) | |
| parent | b2ef0ae4cf1e0c8fc6b8a13f5128a1b1eca3f7d8 (diff) | |
Merge pull request #258115 from wegank/qgis-exiv2
qgis, qgis-ltr: add patch for exiv2 0.28
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped-ltr.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped.nix | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 6bade43a7449a..83be13b959960 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , makeWrapper , mkDerivation , substituteAll @@ -138,6 +139,11 @@ in mkDerivation rec { pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) + (fetchpatch { + name = "qgis-3.28.9-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-mPRo0A7ko4GCHJrfJ2Ls0dUKvkFtDmhKekI2CR9StMw="; + }) ]; cmakeFlags = [ diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 9ddef90fa2e06..8d01ce5f7a529 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , makeWrapper , mkDerivation , substituteAll @@ -141,6 +142,11 @@ in mkDerivation rec { pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://github.com/qgis/QGIS/commit/32f5418fc4f7bb2ee986dee1824ff2989c113a94.patch"; + hash = "sha256-zWyf+kLro4ZyUJLX/nDjY0nLneTaI1DxHvRsvwoWq14="; + }) ]; # Add path to Qt platform plugins |