ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-30 23:34:12 +03:00
Code Issues Projects Releases Wiki Activity

digikam, kphotoalbum, photoqt: patches fixing build against exiv2 0.28.1

Browse Source
This commit is contained in:
6t8k 2023-11-10 02:49:43 +01:00
parent 39404056ed
commit dd14fdd6b2
No known key found for this signature in database
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/graphics/digikam/default.nix
View File

@ -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` # For `digitaglinktree`
, perl, sqlite , perl, sqlite
@ -67,6 +67,14 @@ mkDerivation rec {
hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM="; 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 = [ nativeBuildInputs = [
cmake cmake
doxygen doxygen

9
pkgs/applications/graphics/kphotoalbum/default.nix
View File

@ -1,4 +1,5 @@
{ mkDerivation { mkDerivation
, fetchpatch
, fetchurl , fetchurl
, lib , lib
, extra-cmake-modules , extra-cmake-modules
@ -25,6 +26,14 @@ mkDerivation rec {
hash = "sha256-NWtOIHJXtc8PlltYbbp2YwDf/3QI3MdHNDX7WVQMig4="; 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 # 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 # be on the system anyway, so there is no real harm including it
buildInputs = [ exiv2 phonon libvlc ]; buildInputs = [ exiv2 phonon libvlc ];

7
pkgs/applications/graphics/photoqt/default.nix
View File

@ -30,8 +30,13 @@ stdenv.mkDerivation rec {
hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas="; 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'? # 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 \ substituteInPlace cplusplus/main.cpp \
--replace "std::setlocale" "setlocale" --replace "std::setlocale" "setlocale"
''; '';