From a5ce71d4e8cbe1d3311aeddc86a8d847989d6099 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 4 Jul 2022 10:27:24 +0100 Subject: [PATCH] xmr-stak: drop gcc6 requrement (and cuda support) [ 86%] Building CXX object CMakeFiles/xmrstak_opencl_backend.dir/xmrstak/backend/amd/minethd.cpp.o nvcc fatal : Unsupported gpu architecture 'compute_30' CMake Error at xmrstak_cuda_backend_generated_cuda_extra.cu.o.Release.cmake:220 (message): Error generating /build/source/build/CMakeFiles/xmrstak_cuda_backend.dir/xmrstak/backend/nvidia/nvcc_code/./xmrstak_cuda_backend_generated_cuda_extra.cu.o nvcc fatal : Unsupported gpu architecture 'compute_30' make[2]: *** [CMakeFiles/xmrstak_cuda_backend.dir/build.make:84: CMakeFiles/xmrstak_cuda_backend.dir/xmrstak/backend/nvidia/nvcc_code/xmrstak_cuda_backend_generated_cuda_extra.cu.o] Error 1 CUDA support is broken for a while. Let's drop it along with gcc6 requirement. --- pkgs/applications/misc/xmr-stak/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 91c8c69fe930..3dbf4467a3a8 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,16 +1,11 @@ { stdenv, stdenvGcc6, lib , fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl -, opencl-headers, ocl-icd, hwloc, cudatoolkit +, opencl-headers, ocl-icd, hwloc , devDonationLevel ? "0.0" -, cudaSupport ? false , openclSupport ? true }: -let - stdenv' = if cudaSupport then stdenvGcc6 else stdenv; -in - -stdenv'.mkDerivation rec { +stdenv.mkDerivation rec { pname = "xmr-stak"; version = "2.10.8"; @@ -23,12 +18,11 @@ stdenv'.mkDerivation rec { NIX_CFLAGS_COMPILE = "-O3"; - cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF" + cmakeFlags = [ "-DCUDA_ENABLE=OFF" ] ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; nativeBuildInputs = [ cmake ]; buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ] - ++ lib.optional cudaSupport cudatoolkit ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed03cb2a9aaa..b0a7d95a7052 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28556,9 +28556,7 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; - xmr-stak = callPackage ../applications/misc/xmr-stak { - stdenvGcc6 = gcc6Stdenv; - }; + xmr-stak = callPackage ../applications/misc/xmr-stak { }; xmrig = callPackage ../applications/misc/xmrig { };