From 1701d4b756545542d70452cacd014e6d3340466c Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 5 Nov 2025 05:35:51 -0300 Subject: [PATCH 1/2] clblas: fix build with cmake4 --- pkgs/by-name/cl/clblas/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix index e284e350b80f..27e32115e82d 100644 --- a/pkgs/by-name/cl/clblas/package.nix +++ b/pkgs/by-name/cl/clblas/package.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt + + substituteInPlace src/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + substituteInPlace src/library/tools/tplgen/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" ''; preConfigure = '' From 41fbabea29bc3cf57afd4e9a0802abbeb7e61994 Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 5 Nov 2025 06:32:03 -0300 Subject: [PATCH 2/2] clblas: fix build on darwin --- pkgs/by-name/cl/clblas/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix index 27e32115e82d..f77834528d23 100644 --- a/pkgs/by-name/cl/clblas/package.nix +++ b/pkgs/by-name/cl/clblas/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + llvmPackages_19, fetchFromGitHub, fetchpatch, cmake, @@ -12,15 +13,19 @@ opencl-headers, }: -stdenv.mkDerivation rec { +let + stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; +in + +stdenv'.mkDerivation (finalAttrs: { pname = "clblas"; version = "2.12"; src = fetchFromGitHub { owner = "clMathLibraries"; repo = "clBLAS"; - rev = "v${version}"; - sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Wq5oBl3TW3qpK0cyNWVgJMS5/s8xY1dulqDCkkX5lZQ="; }; patches = [ @@ -64,15 +69,15 @@ stdenv.mkDerivation rec { strictDeps = true; - meta = with lib; { + meta = { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "Software library containing BLAS functions written in OpenCL"; longDescription = '' This package contains a library of BLAS functions on top of OpenCL. ''; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +})