Merge pull request #306375 from GZGavinZhao/rocm-cmake-fix
rocmPackages: use CMake 3.9.2 when building clr
This commit is contained in:
commit
c062c881ad
|
@ -2,6 +2,7 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, callPackage
|
, callPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchurl
|
||||||
, rocmUpdateScript
|
, rocmUpdateScript
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, cmake
|
, cmake
|
||||||
|
@ -33,6 +34,16 @@ let
|
||||||
"--set HSA_PATH ${rocm-runtime}"
|
"--set HSA_PATH ${rocm-runtime}"
|
||||||
"--set ROCM_PATH $out"
|
"--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: {
|
in stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "clr";
|
pname = "clr";
|
||||||
version = "5.7.1";
|
version = "5.7.1";
|
||||||
|
@ -51,7 +62,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
makeWrapper
|
||||||
cmake
|
cmake'
|
||||||
perl
|
perl
|
||||||
python3Packages.python
|
python3Packages.python
|
||||||
python3Packages.cppheaderparser
|
python3Packages.cppheaderparser
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
, callPackage
|
, callPackage
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
|
, fetchurl
|
||||||
, rocmUpdateScript
|
, rocmUpdateScript
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, cmake
|
, cmake
|
||||||
|
@ -34,6 +35,16 @@ let
|
||||||
"--set HSA_PATH ${rocm-runtime}"
|
"--set HSA_PATH ${rocm-runtime}"
|
||||||
"--set ROCM_PATH $out"
|
"--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: {
|
in stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "clr";
|
pname = "clr";
|
||||||
version = "6.0.2";
|
version = "6.0.2";
|
||||||
|
@ -52,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
makeWrapper
|
||||||
cmake
|
cmake'
|
||||||
perl
|
perl
|
||||||
python3Packages.python
|
python3Packages.python
|
||||||
python3Packages.cppheaderparser
|
python3Packages.cppheaderparser
|
||||||
|
|
Loading…
Reference in New Issue
Block a user