From afa4a27a2500519304f482460d5e879018d3ba56 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 20 Mar 2016 21:16:49 +0800 Subject: dropbox-cli: minor refactoring to play nice with dropbox We were previously getting collissions for the following 2 files with files from the dropbox package: - bin/dropbox - share/applications/dropbox.desktop As a consequence the binary has been renamed to dropbox-cli and the .desktop removed as it is redundant. --- pkgs/applications/networking/dropbox-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 892d8fa33009..ab79159ea6e1 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; installPhase = '' - mkdir -p "$out/bin/" "$out/share/applications" - cp data/dropbox.desktop "$out/share/applications" + mkdir -p "$out/bin/" substitute "dropbox.in" "$out/bin/dropbox" \ --replace '@PACKAGE_VERSION@' ${version} \ --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ @@ -25,6 +24,7 @@ stdenv.mkDerivation { --replace '@IMAGEDATA64@' '"too-lazy-to-fix"' sed -i 's:db_path = .*:db_path = "${dropboxd}":' $out/bin/dropbox chmod +x "$out/bin/"* + mv $out/bin/dropbox $out/bin/dropbox-cli patchShebangs "$out/bin" ''; -- cgit 1.4.1