Merge pull request #6937 from bendlas/dropbox

Dropbox
This commit is contained in:
cillianderoiste 2015-03-22 19:25:05 +01:00
commit 14de7bb1f5
2 changed files with 7 additions and 6 deletions

View file

@ -1,13 +1,14 @@
{ stdenv, pkgconfig, fetchurl, python, dropbox }:
let
version = "1.6.2";
version = "2.10.0";
dropboxd = "${dropbox}/bin/dropbox";
in
stdenv.mkDerivation {
name = "dropbox-cli-${version}";
src = fetchurl {
url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2";
sha256 = "1r1kqvnf5a0skby6rr8bmxg128z97fz4gb1n7zlc1vyhqw4k3mb3";
sha256 = "0f765rpp357vy7zvn1jq6q48d10fi4v13yb7vv3qx3az3f3472lg";
};
buildInputs = [ pkgconfig python ];
@ -22,7 +23,7 @@ stdenv.mkDerivation {
--replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \
--replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \
--replace '@IMAGEDATA64@' '"too-lazy-to-fix"'
sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox
chmod +x "$out/bin/"*
patchShebangs "$out/bin"
'';

View file

@ -26,9 +26,9 @@ let
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Dropbox client for: ${stdenv.system} not supported!";
version = "3.2.6";
sha256 = if stdenv.system == "x86_64-linux" then "1pih4dgqsxx9s8vjmn49qdrrgfkkw8wl3m68x7mdz6wqb4lj3sry"
else if stdenv.system == "i686-linux" then "0nnxj32xvhn312a16fhhxjf0brbivaw6m0s8d8qdn44qmg9fr4bz"
version = "3.2.9";
sha256 = if stdenv.system == "x86_64-linux" then "1w1xqizd4xhf9d3gwg9wwys2rdbacs390zf4a7z76m9h5r2lz049"
else if stdenv.system == "i686-linux" then "0lzrb0b7hi22ij7fmn7i3wkzbzv99858ah7w8ysg65za0c8qwksc"
else throw "Dropbox client for: ${stdenv.system} not supported!";
# relative location where the dropbox libraries are stored