diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-04-24 17:04:25 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-04-24 17:06:57 +0200 |
| commit | 05206347258f1e70d2e96e10bbb6402f8e567edc (patch) | |
| tree | 63d107e0a808f2e08d93d0bea8815bb71120edb7 /pkgs | |
| parent | 1b0a7bfe38f8ce676efbf113c965a2851f229548 (diff) | |
| download | nixlib-05206347258f1e70d2e96e10bbb6402f8e567edc.tar nixlib-05206347258f1e70d2e96e10bbb6402f8e567edc.tar.gz nixlib-05206347258f1e70d2e96e10bbb6402f8e567edc.tar.bz2 nixlib-05206347258f1e70d2e96e10bbb6402f8e567edc.tar.lz nixlib-05206347258f1e70d2e96e10bbb6402f8e567edc.tar.xz nixlib-05206347258f1e70d2e96e10bbb6402f8e567edc.tar.zst nixlib-05206347258f1e70d2e96e10bbb6402f8e567edc.zip | |
xmr-stak: doesn't build with gcc7 if cuda is enabled
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/xmr-stak/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index c24e1b0c2f1f..51fd2ee80648 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,11 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl +{ stdenv, stdenvGcc6, lib +, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false , openclSupport ? true }: -stdenv.mkDerivation rec { +let + stdenv' = if cudaSupport then stdenvGcc6 else stdenv; +in + +stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; version = "2.4.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e68c48d89966..eba8440aff4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16785,6 +16785,7 @@ with pkgs; }; xmr-stak = callPackage ../applications/misc/xmr-stak { + stdenvGcc6 = overrideCC stdenv gcc6; hwloc = hwloc-nox; }; |