diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-12-02 01:19:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-02 01:19:11 +0000 |
| commit | 278f2faf8eb364c6959782455e0e8ca78f57a66e (patch) | |
| tree | 4c5c8c328fe1fdfbc4486c594f0e3c989004627d /pkgs/applications/graphics | |
| parent | d1ddc3ff23d5d2a638f281857f56745f5e7315df (diff) | |
| parent | f2d8970aeb75d6e100217bfc30582a0a614bff96 (diff) | |
| download | nixlib-278f2faf8eb364c6959782455e0e8ca78f57a66e.tar nixlib-278f2faf8eb364c6959782455e0e8ca78f57a66e.tar.gz nixlib-278f2faf8eb364c6959782455e0e8ca78f57a66e.tar.bz2 nixlib-278f2faf8eb364c6959782455e0e8ca78f57a66e.tar.lz nixlib-278f2faf8eb364c6959782455e0e8ca78f57a66e.tar.xz nixlib-278f2faf8eb364c6959782455e0e8ca78f57a66e.tar.zst nixlib-278f2faf8eb364c6959782455e0e8ca78f57a66e.zip | |
Merge pull request #32228 from bkchr/digikam
digikam: Fix empty album problem with Qt 5.9.3
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index a62940ff7038..a74c7c44bdb8 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch # For `digitaglinktree` , perl, sqlite @@ -114,6 +114,16 @@ mkDerivation rec { --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" ''; + patches = [ + # fix Qt-5.9.3 empty album problem + (fetchpatch { + url = "https://cgit.kde.org/digikam.git/patch/?id=855ba5b7d4bc6337234720a72ea824ddd3b32e5b"; + sha256 = "0zk8p182piy6xn9v0mhwawya9ciq596vql1qc3lgnx371a97mmni"; + }) + ]; + + patchFlags = "-d core -p1"; + meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; |