mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 06:45:54 +03:00
digikam, kphotoalbum, photoqt: patches fixing build against exiv2 0.28.1
This commit is contained in:
parent
39404056ed
commit
dd14fdd6b2
@ -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
|
||||
|
@ -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 ];
|
||||
|
@ -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"
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user