diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/by-name/ra/rawtherapee/package.nix similarity index 82% rename from pkgs/applications/graphics/rawtherapee/default.nix rename to pkgs/by-name/ra/rawtherapee/package.nix index bd00fa056157..00508760d363 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/by-name/ra/rawtherapee/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitHub, + fetchurl, cmake, pkg-config, util-linux, @@ -22,7 +22,7 @@ libxdmcp, lcms2, libiptcdata, - fftw, + fftwSinglePrec, expat, pcre2, libsigcxx, @@ -39,17 +39,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "rawtherapee"; version = "5.12"; - src = fetchFromGitHub { - owner = "RawTherapee"; - repo = "RawTherapee"; - tag = finalAttrs.version; - hash = "sha256-h8eWnw9I1R0l9WAI/DylsdA241qU9NhYGEPYz+JlE18="; + src = fetchurl { # The developers 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://www.rawtherapee.com/downloads/5.12/#news-relevant-to-package-maintainers + url = "https://rawtherapee.com/shared/source/rawtherapee-${finalAttrs.version}.tar.xz"; + hash = "sha256-2abBBTfWSihbxGVnX+WaqpTOMiOCPfvs8K4slZkILVc="; }; postPatch = '' + # https://github.com/NixOS/nixpkgs/issues/475835 + # https://github.com/RawTherapee/RawTherapee/issues/7443#issuecomment-3014132156 + # remove for 5.13 + substituteInPlace rtengine/procparams.cc --replace \ + 'outputProfile(options.rtSettings.srgb),' \ + 'outputProfile("RTv4_sRGB"),' + cat < ReleaseInfo.cmake set(GIT_DESCRIBE ${finalAttrs.version}) set(GIT_BRANCH ${finalAttrs.version}) @@ -89,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { libxdmcp lcms2 libiptcdata - fftw + fftwSinglePrec expat pcre2 libsigcxx diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a08629a3871a..9722c8d80068 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10413,10 +10413,6 @@ with pkgs; withXineBackend = true; }; - rawtherapee = callPackage ../applications/graphics/rawtherapee { - fftw = fftwSinglePrec; - }; - reaper = callPackage ../applications/audio/reaper { jackLibrary = libjack2; # Another option is "pipewire.jack". ffmpeg = ffmpeg_4-headless;