From ae05b5dbc7d9353f307528c4aeb2b91ae1da2aec Mon Sep 17 00:00:00 2001 From: Xinyang Li Date: Fri, 17 Oct 2025 23:00:24 +0300 Subject: [PATCH] hdrmerge: 0.5.0-unstable-2024-08-02 -> 0.5.0-unstable-2025-04-26 --- pkgs/by-name/hd/hdrmerge/package.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/hd/hdrmerge/package.nix b/pkgs/by-name/hd/hdrmerge/package.nix index c743ba7196b8..9e2bd1865945 100644 --- a/pkgs/by-name/hd/hdrmerge/package.nix +++ b/pkgs/by-name/hd/hdrmerge/package.nix @@ -15,14 +15,20 @@ stdenv.mkDerivation rec { pname = "hdrmerge"; - version = "0.5.0-unstable-2024-08-02"; + version = "0.5.0-unstable-2025-04-26"; src = fetchFromGitHub { owner = "jcelaya"; repo = "hdrmerge"; - rev = "e2a46f97498b321b232cc7f145461212677200f1"; - hash = "sha256-471gJtF9M36pAId9POG8ZIpNk9H/157EdHqXSAPlhN0="; + rev = "3bbe43771ba15b899151721bc14aa57e86b60f2f"; + hash = "sha256-4FIGchwROXe8qLRBaYih2k9zDll2YoYGDj06SrIqK9Q="; }; + # Disable find_package(ALGLIB REQUIRED) in the CMake file by providing a empty + # FindALGLIB.cmake, and provide ALGLIB_INCLUDES and ALGLIB_LIBRARIES ourselves + preConfigure = '' + touch cmake/FindALGLIB.cmake + ''; + nativeBuildInputs = [ cmake pkg-config @@ -39,12 +45,8 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DALGLIB_DIR:PATH=${alglib}" - ]; - - CXXFLAGS = [ - # GCC 13: error: 'uint32_t' does not name a type - "-include cstdint" + (lib.cmakeFeature "ALGLIB_INCLUDES" "${alglib}/include/alglib") + (lib.cmakeFeature "ALGLIB_LIBRARIES" "alglib3") ]; desktopItems = [