diff options
| author | Connor Baker <connor.baker@tweag.io> | 2024-01-25 14:14:12 +0000 |
|---|---|---|
| committer | Connor Baker <connor.baker@tweag.io> | 2024-02-07 19:03:47 +0000 |
| commit | 9d4ac33716fc1f3f3626dcd3b0f0bfe771fdbc16 (patch) | |
| tree | 8c393464cde65337bb0a4cb32e1749a396f4a78c | |
| parent | be7e7209885cfb7a6016afea29de44730e85776c (diff) | |
| download | nixlib-9d4ac33716fc1f3f3626dcd3b0f0bfe771fdbc16.tar nixlib-9d4ac33716fc1f3f3626dcd3b0f0bfe771fdbc16.tar.gz nixlib-9d4ac33716fc1f3f3626dcd3b0f0bfe771fdbc16.tar.bz2 nixlib-9d4ac33716fc1f3f3626dcd3b0f0bfe771fdbc16.tar.lz nixlib-9d4ac33716fc1f3f3626dcd3b0f0bfe771fdbc16.tar.xz nixlib-9d4ac33716fc1f3f3626dcd3b0f0bfe771fdbc16.tar.zst nixlib-9d4ac33716fc1f3f3626dcd3b0f0bfe771fdbc16.zip | |
magma: switch to strings.cmake* functions
| -rw-r--r-- | pkgs/development/libraries/science/math/magma/generic.nix | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 5c195db04bad..c337f0e78529 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -128,21 +128,18 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DGPU_TARGET=${gpuTargetString}" - (lib.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport) - (lib.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport) - ] ++ lists.optionals static [ - "-DBUILD_SHARED_LIBS=OFF" + (strings.cmakeFeature "GPU_TARGET" gpuTargetString) + (strings.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport) + (strings.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport) + (strings.cmakeBool "BUILD_SHARED_LIBS" (!static)) ] ++ lists.optionals cudaSupport [ - "-DCMAKE_CUDA_ARCHITECTURES=${cudaArchitecturesString}" - "-DMIN_ARCH=${minArch}" # Disarms magma's asserts - "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc" - "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" + (strings.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts + (strings.cmakeFeature "CMAKE_C_COMPILER" "${backendStdenv.cc}/bin/cc") + (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${backendStdenv.cc}/bin/c++") ] ++ lists.optionals rocmSupport [ - "-DCMAKE_C_COMPILER=${rocmPackages.clr}/bin/hipcc" - "-DCMAKE_CXX_COMPILER=${rocmPackages.clr}/bin/hipcc" - ] ++ lists.optionals (cudaPackages.cudaAtLeast "12.0.0") [ - (lib.cmakeBool "USE_FORTRAN" false) + (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc") + (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc") ]; buildFlags = [ |