From d33072de3d675ed8740e5f518c2d67e289689a49 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Tue, 21 May 2019 20:18:34 +0200 Subject: [PATCH] cgminer: Use standard OpenCL libraries. --- pkgs/applications/misc/cgminer/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index ee3e2a955d32..9d63b5aedcb7 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -1,5 +1,5 @@ { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake -, curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }: +, curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }: stdenv.mkDerivation rec { version = "3.7.2"; @@ -13,17 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoconf automake libtool curl ncurses amdappsdk amdadlsdk + autoconf automake libtool curl ncurses ocl-icd opencl-headers xorg.libX11 xorg.libXext xorg.libXinerama jansson ]; configureScript = "./autogen.sh"; configureFlags = [ "--enable-scrypt" "--enable-opencl" ]; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; - preConfigure = '' - ln -s ${amdadlsdk}/include/* ADL_SDK/ - ''; - postBuild = '' gcc api-example.c -o cgminer-api ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f89abd88584..835522cf641c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16993,9 +16993,7 @@ in inherit (python3Packages) python wrapPython pygments markdown; }; - cgminer = callPackage ../applications/misc/cgminer { - amdappsdk = amdappsdk28; - }; + cgminer = callPackage ../applications/misc/cgminer { }; chirp = callPackage ../applications/radio/chirp { inherit (pythonPackages) pyserial pygtk;