colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #306375 from GZGavinZhao/rocm-cmake-fix 

rocmPackages: use CMake 3.9.2 when building clr
This commit is contained in:
Ulrik Strid 2024-04-24 17:03:48 +02:00 committed by GitHub
parent d171375d77 da7ab26875
commit c062c881ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/rocm-modules/5/clr/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, callPackage
, fetchFromGitHub
, fetchurl
, rocmUpdateScript
, makeWrapper
, cmake
@ -33,6 +34,16 @@ let
"--set HSA_PATH ${rocm-runtime}"
"--set ROCM_PATH $out"
];
# https://github.com/NixOS/nixpkgs/issues/305641
# Not needed when 3.29.2 is in unstable
cmake' = cmake.overrideAttrs(old: rec {
version = "3.29.2";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
hash = "sha256-NttLaSaqt0G6bksuotmckZMiITIwi03IJNQSPLcwNS4=";
};
});
in stdenv.mkDerivation (finalAttrs: {
pname = "clr";
version = "5.7.1";
@ -51,7 +62,7 @@ in stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
makeWrapper
cmake
cmake'
perl
python3Packages.python
python3Packages.cppheaderparser

13
pkgs/development/rocm-modules/6/clr/default.nix
View File

@ -3,6 +3,7 @@
, callPackage
, fetchFromGitHub
, fetchpatch
, fetchurl
, rocmUpdateScript
, makeWrapper
, cmake
@ -34,6 +35,16 @@ let
"--set HSA_PATH ${rocm-runtime}"
"--set ROCM_PATH $out"
];
# https://github.com/NixOS/nixpkgs/issues/305641
# Not needed when 3.29.2 is in unstable
cmake' = cmake.overrideAttrs(old: rec {
version = "3.29.2";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
hash = "sha256-NttLaSaqt0G6bksuotmckZMiITIwi03IJNQSPLcwNS4=";
};
});
in stdenv.mkDerivation (finalAttrs: {
pname = "clr";
version = "6.0.2";
@ -52,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
makeWrapper
cmake
cmake'
perl
python3Packages.python
python3Packages.cppheaderparser