diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-17 22:08:16 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-17 22:08:16 +0200 |
commit | 6bcf790d055944fa56129cc4f5e1ac5374e6aea6 (patch) | |
tree | 11ef08e17443d2e87429254b9dbf1331225004bc /pkgs/applications | |
parent | afdc7fdfb6ff0380c8c46cf56afbe8611f34ba7d (diff) | |
parent | 0b875c8706276b2625e0dc8efd8372ac84fef5c4 (diff) | |
download | nixlib-6bcf790d055944fa56129cc4f5e1ac5374e6aea6.tar nixlib-6bcf790d055944fa56129cc4f5e1ac5374e6aea6.tar.gz nixlib-6bcf790d055944fa56129cc4f5e1ac5374e6aea6.tar.bz2 nixlib-6bcf790d055944fa56129cc4f5e1ac5374e6aea6.tar.lz nixlib-6bcf790d055944fa56129cc4f5e1ac5374e6aea6.tar.xz nixlib-6bcf790d055944fa56129cc4f5e1ac5374e6aea6.tar.zst nixlib-6bcf790d055944fa56129cc4f5e1ac5374e6aea6.zip |
Merge branch 'master' into x-updates
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/cgminer/default.nix | 44 | ||||
-rw-r--r-- | pkgs/applications/networking/dropbox-cli/default.nix | 16 |
2 files changed, 53 insertions, 7 deletions
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix new file mode 100644 index 000000000000..4ae404a002f1 --- /dev/null +++ b/pkgs/applications/misc/cgminer/default.nix @@ -0,0 +1,44 @@ +{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake, + curl, ncurses, amdappsdk, amdadlsdk, xorg }: + +stdenv.mkDerivation rec { + version = "2.11.4"; + name = "cgminer-${version}"; + + src = fetchgit { + url = "https://github.com/ckolivas/cgminer.git"; + rev = "96c8ff5f10f2d8f0cf4d1bd889e8eeac2e4aa715"; + sha256 = "1vf9agy4vw50cap03qig2y65hdrsdy7cknkzyagv89w5xb230r9a"; + }; + + buildInputs = [ autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama ]; + configureScript = "./autogen.sh"; + configureFlags = "--enable-scrypt"; + NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; + + preConfigure = '' + ln -s ${amdadlsdk}/include/* ADL_SDK/ + ''; + + postBuild = '' + gcc api-example.c -I compat/jansson -o cgminer-api + ''; + + postInstall = '' + cp cgminer-api $out/bin/ + chmod 444 $out/bin/*.cl + ''; + + meta = with stdenv.lib; { + description = "CPU/GPU miner in c for bitcoin"; + longDescription= '' + This is a multi-threaded multi-pool GPU, FPGA and ASIC miner with ATI GPU + monitoring, (over)clocking and fanspeed support for bitcoin and derivative + coins. Do not use on multiple block chains at the same time! + ''; + homepage = "https://github.com/ckolivas/cgminer"; + license = licenses.gpl3; + maintainers = [ maintainers.offline ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index b298b3c9df99..34fe6db8932b 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,17 +1,18 @@ -{ stdenv, coreutils, fetchurl, python }: +{ stdenv, coreutils, fetchurl, python, dropbox }: stdenv.mkDerivation { name = "dropbox-cli"; src = fetchurl { + # Note: dropbox doesn't version this file. Annoying. url = "https://linux.dropbox.com/packages/dropbox.py"; - sha256 = "1x46i0aplah4a2nqglb8byl3c60w7h1cjja62myxj2dpxyv7fydy"; + sha256 = "0p1pg8bw6mlhqi5k8y3pgs7byg0kfvq57s53sh188lb5sxvlg7yz"; }; buildInputs = [ coreutils python ]; phases = "installPhase fixupPhase"; - + installPhase = '' mkdir -pv $out/bin/ cp $src $out/bin/dropbox-cli @@ -20,17 +21,18 @@ stdenv.mkDerivation { fixupPhase = '' substituteInPlace $out/bin/dropbox-cli \ --replace "/usr/bin/python" ${python}/bin/python \ - --replace "use dropbox help" "use dropbox-cli help" - + --replace "use dropbox help" "use dropbox-cli help" \ + --replace "~/.dropbox-dist/dropboxd" ${dropbox}/bin/dropbox + chmod +x $out/bin/dropbox-cli ''; - + meta = { homepage = http://dropbox.com; description = "Command line client for the dropbox daemon."; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = stdenv.lib.platforms.linux; }; } - |