From 1570336325b7dcac981ad6964148fc7692f4eea9 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 16 Jun 2013 23:38:33 +0200
Subject: [PATCH] Fix dropbox-cli.
Dropbox doesn't version the CLI. This broke the download. This patch
also fixes the `dropbox-cli start' command.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
.../networking/dropbox-cli/default.nix | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
index b298b3c9df99..936856448694 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,11 +21,12 @@ 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.";
@@ -33,4 +35,3 @@ stdenv.mkDerivation {
platforms = stdenv.lib.platforms.linux;
};
}
-