From 7f75ff0da259ffaa91c2864bbcdbcdc08cef5663 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 19 Jul 2025 14:20:21 +0530 Subject: [PATCH] hdr10plus: decouple the src from hdr10plus_tool The main reason for this is cargo-c latest version is not available in master yet. This will need to be reverted in staging once https://github.com/NixOS/nixpkgs/pull/413726 is merged Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/hd/hdr10plus/package.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hd/hdr10plus/package.nix b/pkgs/by-name/hd/hdr10plus/package.nix index 1c466b21851a..ee57905180f1 100644 --- a/pkgs/by-name/hd/hdr10plus/package.nix +++ b/pkgs/by-name/hd/hdr10plus/package.nix @@ -4,6 +4,7 @@ rust, rustPlatform, hdr10plus_tool, + fetchFromGitHub, cargo-c, fontconfig, }: @@ -16,15 +17,26 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "hdr10plus"; - version = "2.1.4"; + # Version of the library, not the tool + # See https://github.com/quietvoid/hdr10plus_tool/blob/main/hdr10plus/Cargo.toml + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "quietvoid"; + repo = "hdr10plus_tool"; + # repo release snapshots are versioned per the tool + # https://github.com/quietvoid/hdr10plus_tool/releases/latest + tag = "1.7.0"; + hash = "sha256-eueB+ZrOrnySEwUpCTvC4qARCsDcHJhm088XepLTlOE="; + }; + + cargoHash = "sha256-3D0HjDtKwYoi9bpQnosC/TPNBjfiWi5m1CH1eGQpGg0="; outputs = [ "out" "dev" ]; - inherit (hdr10plus_tool) src cargoDeps cargoHash; - nativeBuildInputs = [ cargo-c ]; buildInputs = [ fontconfig ];