From 54c8f281049609328b1338c392b6dddc4d554331 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Tue, 24 Dec 2024 13:18:33 -0800 Subject: [PATCH] Make cmake stop complaining and fix nix-updater. --- pkgs/by-name/da/darktable/package.nix | 38 +++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 8545d57c91ea42..34548ba1377970 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -16,6 +16,7 @@ # buildInputs SDL2, adwaita-icon-theme, + alsa-lib, cairo, curl, exiv2, @@ -31,9 +32,14 @@ json-glib, lcms2, lensfun, + lerc, libaom, libavif, + libdatrie, + libepoxy, libexif, + libgcrypt, + libgpg-error, libgphoto2, libheif, libjpeg, @@ -42,27 +48,35 @@ librsvg, libsecret, libsoup_2_4, + libsysprof-capture, + libthai, libtiff, libwebp, libxslt, lua, + util-linux, openexr_3, openjpeg, osm-gps-map, - pcre, + pcre2, portmidi, pugixml, sqlite, # Linux only colord, colord-gtk, + libselinux, + libsepol, libX11, + libXdmcp, + libxkbcommon, + libXtst, ocl-icd, # Darwin only gtk-mac-integration, versionCheckHook, - nix-update-script, + gitUpdater, }: stdenv.mkDerivation rec { @@ -89,6 +103,7 @@ stdenv.mkDerivation rec { [ SDL2 adwaita-icon-theme + alsa-lib cairo curl exiv2 @@ -104,9 +119,14 @@ stdenv.mkDerivation rec { json-glib lcms2 lensfun + lerc libaom libavif + libdatrie + libepoxy libexif + libgcrypt + libgpg-error libgphoto2 libheif libjpeg @@ -115,14 +135,17 @@ stdenv.mkDerivation rec { librsvg libsecret libsoup_2_4 + libsysprof-capture + libthai libtiff libwebp libxslt lua + util-linux openexr_3 openjpeg osm-gps-map - pcre + pcre2 portmidi pugixml sqlite @@ -130,7 +153,12 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ colord colord-gtk + libselinux + libsepol libX11 + libXdmcp + libxkbcommon + libXtst ocl-icd ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration @@ -171,8 +199,8 @@ stdenv.mkDerivation rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { - rev-prefix = "release-"; + passthru.updateScript = gitUpdater { + url = "https://github.com/darktable-org/darktable.git"; }; meta = {