From 4cf29404142fece676ee9b25c9da394ff823702c Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 26 Dec 2025 23:46:57 +0200 Subject: [PATCH] darktable: remove top-level override --- pkgs/by-name/da/darktable/package.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index ec270b04428b..ce87ec77391a 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -53,7 +53,7 @@ libtiff, libwebp, libxml2, - lua, + lua5_4, util-linux, openexr, openjpeg, @@ -78,7 +78,9 @@ versionCheckHook, gitUpdater, }: - +let + pugixml-shared = pugixml.override { shared = true; }; +in stdenv.mkDerivation rec { version = "5.4.0"; pname = "darktable"; @@ -138,13 +140,13 @@ stdenv.mkDerivation rec { libtiff libwebp libxml2 - lua + lua5_4 openexr openjpeg osm-gps-map pcre2 portmidi - pugixml + pugixml-shared sqlite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01921036db84..d7c4f6d95475 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10059,11 +10059,6 @@ with pkgs; haskell.lib.compose.justStaticExecutables haskellPackages.darcs ); - darktable = callPackage ../by-name/da/darktable/package.nix { - lua = lua5_4; - pugixml = pugixml.override { shared = true; }; - }; - datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix { pythonPackages = datadog-integrations-core { }; };