diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-05 16:52:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-05 16:52:34 +0200 |
commit | d01dd5444d45e53e7b8be132e5a0a961758829f3 (patch) | |
tree | d5f49c20832d0434d518bf9bde0e32e9af55435a /pkgs/tools/misc | |
parent | 24f76631295137e2b9fd6edaf43fb79cba8595ff (diff) | |
parent | cf42508bbd301a4f360cdd7da6fa66879b42695d (diff) | |
download | nixlib-d01dd5444d45e53e7b8be132e5a0a961758829f3.tar nixlib-d01dd5444d45e53e7b8be132e5a0a961758829f3.tar.gz nixlib-d01dd5444d45e53e7b8be132e5a0a961758829f3.tar.bz2 nixlib-d01dd5444d45e53e7b8be132e5a0a961758829f3.tar.lz nixlib-d01dd5444d45e53e7b8be132e5a0a961758829f3.tar.xz nixlib-d01dd5444d45e53e7b8be132e5a0a961758829f3.tar.zst nixlib-d01dd5444d45e53e7b8be132e5a0a961758829f3.zip |
Merge pull request #109838 from noneucat/fix/ethminer
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/ethminer/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 3a8169c6b3d8..675147bc5d57 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - clangStdenv, fetchFromGitHub, opencl-headers, cmake, @@ -17,13 +16,9 @@ openssl, pkg-config, cli11 -}@args: +}: -# Note that this requires clang < 9.0 to build, and currently -# clangStdenv provides clang 7.1 which satisfies the requirement. -let stdenv = if cudaSupport then clangStdenv else args.stdenv; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ethminer"; version = "0.19.0"; @@ -43,9 +38,11 @@ in stdenv.mkDerivation rec { "-DAPICORE=ON" "-DETHDBUS=OFF" "-DCMAKE_BUILD_TYPE=Release" - ] ++ lib.optionals (!cudaSupport) [ + ] ++ (if cudaSupport then [ + "-DCUDA_PROPAGATE_HOST_FLAGS=off" + ] else [ "-DETHASHCUDA=OFF" # on by default - ]; + ]); nativeBuildInputs = [ cmake @@ -81,6 +78,5 @@ in stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ atemu ]; license = licenses.gpl3Only; - broken = cudaSupport; }; } |