diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 14c3a0dc7ef2..aa7c9c84ac16 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,9 +1,17 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , cmake , pkg-config +, util-linux +, libselinux +, libsepol +, lerc +, libthai +, libdatrie +, libxkbcommon +, libepoxy +, libXtst , wrapGAppsHook3 , makeWrapper , pixman @@ -15,37 +23,31 @@ , libiptcdata , fftw , expat -, pcre +, pcre2 , libsigcxx , lensfun , librsvg , libcanberra-gtk3 , gtk-mac-integration , exiv2 +, libraw + , libjxl }: stdenv.mkDerivation rec { pname = "rawtherapee"; - version = "5.10"; + version = "5.11"; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - hash = "sha256-rIwwKNm7l7oPEt95sHyRj4aF3mtnvM4KAu8oVaIMwyE="; + hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730="; # The developpers ask not to use the tarball from Github releases, see # https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers forceFetchGit = true; }; - # https://github.com/Beep6581/RawTherapee/issues/7074 - patches = [ - (fetchurl { - url = "https://github.com/Beep6581/RawTherapee/commit/6b9f45c69c1ddfc3607d3d9c1206dcf1def30295.diff"; - hash = "sha256-3Rti9HV8N1ueUm5B9qxEZL7Lb9bBb+iy2AGKMpJ9YOM="; - }) - ]; - postPatch = '' echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ @@ -61,6 +63,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + util-linux + libselinux + libsepol + lerc + libthai + libdatrie + libxkbcommon + libepoxy + libXtst pixman libpthreadstubs gtkmm3 @@ -70,11 +81,13 @@ stdenv.mkDerivation rec { libiptcdata fftw expat - pcre + pcre2 libsigcxx lensfun librsvg exiv2 + libraw + libjxl ] ++ lib.optionals stdenv.isLinux [ libcanberra-gtk3 ] ++ lib.optionals stdenv.isDarwin [ @@ -84,6 +97,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" + "-DWITH_SYSTEM_LIBRAW=\"ON\"" + "-DWITH_JXL=\"ON\"" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ];