From 14d2848c9251bc92c475ba3c0d379b5696c4e04b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 5 Aug 2024 20:41:17 -0400 Subject: [PATCH 1/2] digikam: wrap with exiftool --- pkgs/by-name/di/digikam/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 3f2623d612c3..e6e4144ee961 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -12,6 +12,7 @@ bison, wrapGAppsHook3, + exiftool, opencv, libtiff, libpng, @@ -181,6 +182,7 @@ stdenv.mkDerivation (finalAttrs: { gnumake hugin enblend-enfuse + exiftool ] }) qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${kdePackages.qtbase.qtPluginPrefix}/digikam) From 03d798e3819f98bbb21eda1d23fdc5866f559306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 5 Aug 2024 20:42:06 -0400 Subject: [PATCH 2/2] digikam: fix binary replacements --- pkgs/by-name/di/digikam/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index e6e4144ee961..40989dd72c95 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -187,8 +187,8 @@ stdenv.mkDerivation (finalAttrs: { }) qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${kdePackages.qtbase.qtPluginPrefix}/digikam) substituteInPlace $out/bin/digitaglinktree \ - --replace "/usr/bin/perl" "${perl}/bin/perl" \ - --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" + --replace "/usr/bin/perl" "${lib.getExe perl}" \ + --replace "/usr/bin/sqlite3" "${lib.getExe sqlite}" ''; meta = {