diff options
author | 6t8k <58048945+6t8k@users.noreply.github.com> | 2023-11-10 02:49:43 +0100 |
---|---|---|
committer | 6t8k <58048945+6t8k@users.noreply.github.com> | 2023-11-10 03:43:56 +0100 |
commit | dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b (patch) | |
tree | 83d290ec0adce4c699c625d66bd12021a3216b57 | |
parent | 39404056ed559f690060467932d32fe3bca55350 (diff) | |
download | nixpkgs-dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b.tar nixpkgs-dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b.tar.gz nixpkgs-dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b.tar.bz2 nixpkgs-dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b.tar.lz nixpkgs-dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b.tar.xz nixpkgs-dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b.tar.zst nixpkgs-dd14fdd6b25879c2c0f96f8a0d781fa499d6d53b.zip |
digikam, kphotoalbum, photoqt: patches fixing build against exiv2 0.28.1
-rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/graphics/kphotoalbum/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 7 |
3 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 2a7e0e9ac0f..be714028ec9 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook # For `digitaglinktree` , perl, sqlite @@ -67,6 +67,14 @@ mkDerivation rec { hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM="; }; + # Fix build against exiv2 0.28.1 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch"; + hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg="; + }) + ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/applications/graphics/kphotoalbum/default.nix b/pkgs/applications/graphics/kphotoalbum/default.nix index f8cb634cad7..6ff2f433995 100644 --- a/pkgs/applications/graphics/kphotoalbum/default.nix +++ b/pkgs/applications/graphics/kphotoalbum/default.nix @@ -1,4 +1,5 @@ { mkDerivation +, fetchpatch , fetchurl , lib , extra-cmake-modules @@ -25,6 +26,14 @@ mkDerivation rec { hash = "sha256-NWtOIHJXtc8PlltYbbp2YwDf/3QI3MdHNDX7WVQMig4="; }; + # Fix build against exiv2 0.28.1 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/graphics/kphotoalbum/-/commit/1ceb1ae37f3f95aa290b0846969af4b26f616760.patch"; + hash = "sha256-SfBJHyJZcysvemc/F09GPczBjcofxGomgjJ814PSU+c="; + }) + ]; + # not sure if we really need phonon when we have vlc, but on KDE it's bound to # be on the system anyway, so there is no real harm including it buildInputs = [ exiv2 phonon libvlc ]; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 6a7a57fd25f..9513b92f60a 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -30,8 +30,13 @@ stdenv.mkDerivation rec { hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas="; }; + postPatch = '' + # exiv2 0.28.1 + substituteInPlace CMakeLists.txt \ + --replace "exiv2lib" "exiv2" + '' # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? - postPatch = lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace cplusplus/main.cpp \ --replace "std::setlocale" "setlocale" ''; |