From 84031981a546cadbd676a4d0cceacb64c68398b6 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 8 May 2014 16:35:47 +0200 Subject: dropbox-cli: use stable URL, version 1.6.2 Thanks to @darklajid for reporting and testing on IRC. --- .../networking/dropbox-cli/default.nix | 39 +++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'pkgs/applications/networking/dropbox-cli') diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 6af15211a527..5262c121bb28 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,31 +1,30 @@ -{ stdenv, coreutils, fetchurl, python, dropbox }: - +{ stdenv, pkgconfig, fetchurl, python, dropbox }: +let + version = "1.6.2"; +in stdenv.mkDerivation { - # 1.6.0 because it's the only version mentioned in the script - name = "dropbox-cli-1.6.0"; + name = "dropbox-cli-${version}"; src = fetchurl { - # Note: dropbox doesn't version this file. Annoying. - url = "https://linux.dropbox.com/packages/dropbox.py"; - sha256 = "0505k0xrhbmsv7g5phxxnz5wbff6m5gdsqyxkhd95wdi9d71c43c"; + url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; + sha256 = "1r1kqvnf5a0skby6rr8bmxg128z97fz4gb1n7zlc1vyhqw4k3mb3"; }; - buildInputs = [ coreutils python ]; + buildInputs = [ pkgconfig python ]; - phases = "installPhase fixupPhase"; + phases = "unpackPhase installPhase"; installPhase = '' - mkdir -pv $out/bin/ - cp $src $out/bin/dropbox-cli - ''; - - fixupPhase = '' - substituteInPlace $out/bin/dropbox-cli \ - --replace "/usr/bin/python" ${python}/bin/python \ - --replace "use dropbox help" "use dropbox-cli help" \ - --replace "~/.dropbox-dist/dropboxd" ${dropbox}/bin/dropbox - - chmod +x $out/bin/dropbox-cli + ensureDir "$out/bin/" "$out/share/applications" + cp data/dropbox.desktop "$out/share/applications" + substitute "dropbox.in" "$out/bin/dropbox" \ + --replace '@PACKAGE_VERSION@' ${version} \ + --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ + --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \ + --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' + + chmod +x "$out/bin/"* + patchShebangs "$out/bin" ''; meta = { -- cgit 1.4.1