public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61823 from ambrop72/cgminer-cleanup

Browse Source 
Cgminer cleanup
This commit is contained in:
Joachim F 2019-05-29 20:10:43 +00:00 committed by GitHub
commit 7eb4b833aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/cgminer/default.nix
View File

@ -1,5 +1,5 @@
{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
, curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }: , curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.7.2"; version = "3.7.2";
@ -13,17 +13,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
autoconf automake libtool curl ncurses amdappsdk amdadlsdk autoconf automake libtool curl ncurses ocl-icd opencl-headers
xorg.libX11 xorg.libXext xorg.libXinerama jansson xorg.libX11 xorg.libXext xorg.libXinerama jansson
]; ];
configureScript = "./autogen.sh"; configureScript = "./autogen.sh";
configureFlags = [ "--enable-scrypt" "--enable-opencl" ]; configureFlags = [ "--enable-scrypt" "--enable-opencl" ];
NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
preConfigure = ''
ln -s ${amdadlsdk}/include/* ADL_SDK/
'';
postBuild = '' postBuild = ''
gcc api-example.c -o cgminer-api gcc api-example.c -o cgminer-api
''; '';

24
pkgs/top-level/all-packages.nix
View File

@ -8618,26 +8618,6 @@ in
### DEVELOPMENT / MISC ### DEVELOPMENT / MISC
amdadlsdk = callPackage ../development/misc/amdadl-sdk { };
amdappsdk26 = amdappsdk.override {
version = "2.6";
};
amdappsdk27 = amdappsdk.override {
version = "2.7";
};
amdappsdk28 = amdappsdk.override {
version = "2.8";
};
amdappsdk = callPackage ../development/misc/amdapp-sdk { };
amdappsdkFull = amdappsdk.override {
samples = true;
};
amtk = callPackage ../development/libraries/amtk { }; amtk = callPackage ../development/libraries/amtk { };
avrlibc = callPackage ../development/misc/avr/libc {}; avrlibc = callPackage ../development/misc/avr/libc {};
@ -17071,9 +17051,7 @@ in
inherit (python3Packages) python wrapPython pygments markdown; inherit (python3Packages) python wrapPython pygments markdown;
}; };
cgminer = callPackage ../applications/misc/cgminer { cgminer = callPackage ../applications/misc/cgminer { };
amdappsdk = amdappsdk28;
};
chirp = callPackage ../applications/radio/chirp { chirp = callPackage ../applications/radio/chirp {
inherit (pythonPackages) pyserial pygtk; inherit (pythonPackages) pyserial pygtk;