Merge pull request #133274 from applePrincess/fix-ethminer

ethminer: fix global-context

authored by Sandro and committed by GitHub 84caf07d 6494a1a6

+30
+25
pkgs/tools/misc/ethminer/add-global-context.patch
··· 1 + diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt 2 + index 1a53de8..832e926 100644 3 + --- a/libethcore/CMakeLists.txt 4 + +++ b/libethcore/CMakeLists.txt 5 + @@ -7,7 +7,7 @@ set(SOURCES 6 + include_directories(BEFORE ..) 7 + 8 + add_library(ethcore ${SOURCES}) 9 + -target_link_libraries(ethcore PUBLIC devcore ethash::ethash PRIVATE hwmon) 10 + +target_link_libraries(ethcore PUBLIC devcore ethash::ethash ethash-global-context PRIVATE hwmon) 11 + 12 + if(ETHASHCL) 13 + target_link_libraries(ethcore PRIVATE ethash-cl) 14 + diff --git a/libethcore/EthashAux.h b/libethcore/EthashAux.h 15 + index d9aadc7..fe5c6cf 100644 16 + --- a/libethcore/EthashAux.h 17 + +++ b/libethcore/EthashAux.h 18 + @@ -22,6 +22,7 @@ 19 + #include <libdevcore/Worker.h> 20 + 21 + #include <ethash/ethash.hpp> 22 + +#include <ethash/global_context.hpp> 23 + 24 + namespace dev 25 + {
+5
pkgs/tools/misc/ethminer/default.nix
··· 64 64 cudatoolkit 65 65 ]; 66 66 67 + patches = [ 68 + # global context library is separated from libethash 69 + ./add-global-context.patch 70 + ]; 71 + 67 72 preConfigure = '' 68 73 sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt 69 74 '';