b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #180090 from trofi/drop-cuda-from-xmr-stak

Browse source 
xmr-stak: drop gcc6 requrement (and cuda support)
This commit is contained in:
Sergei Trofimovich 2022-07-06 08:10:15 +01:00 committed by GitHub
parent d3c3db6a08 a5ce71d4e8
commit 79f0470dc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/misc/xmr-stak/default.nix
View file

@ -1,16 +1,11 @@
{ stdenv, stdenvGcc6, lib { stdenv, stdenvGcc6, lib
, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl , fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl
, opencl-headers, ocl-icd, hwloc, cudatoolkit , opencl-headers, ocl-icd, hwloc
, devDonationLevel ? "0.0" , devDonationLevel ? "0.0"
, cudaSupport ? false
, openclSupport ? true , openclSupport ? true
}: }:
let stdenv.mkDerivation rec {
stdenv' = if cudaSupport then stdenvGcc6 else stdenv;
in
stdenv'.mkDerivation rec {
pname = "xmr-stak"; pname = "xmr-stak";
version = "2.10.8"; version = "2.10.8";
@ -23,12 +18,11 @@ stdenv'.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-O3"; NIX_CFLAGS_COMPILE = "-O3";
cmakeFlags = lib.optional (!cudaSupport) "-DCUDA_ENABLE=OFF" cmakeFlags = [ "-DCUDA_ENABLE=OFF" ]
++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ] buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ]
++ lib.optional cudaSupport cudatoolkit
++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; ++ lib.optionals openclSupport [ opencl-headers ocl-icd ];
postPatch = '' postPatch = ''

4
pkgs/top-level/all-packages.nix
View file

@ -28576,9 +28576,7 @@ with pkgs;
mod-distortion = callPackage ../applications/audio/mod-distortion { }; mod-distortion = callPackage ../applications/audio/mod-distortion { };
xmr-stak = callPackage ../applications/misc/xmr-stak { xmr-stak = callPackage ../applications/misc/xmr-stak { };
stdenvGcc6 = gcc6Stdenv;
};
xmrig = callPackage ../applications/misc/xmrig { }; xmrig = callPackage ../applications/misc/xmrig { };