about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@speartail.com>2016-03-20 21:16:49 +0800
committerPeter Hoeg <peter@speartail.com>2016-03-20 21:16:49 +0800
commitafa4a27a2500519304f482460d5e879018d3ba56 (patch)
tree9633bd2c60b988dc0a2bcde6c42405f4fb03346c
parente3aa3c6abb7109c494431f3a06d46e66d08f9bd3 (diff)
downloadnixlib-afa4a27a2500519304f482460d5e879018d3ba56.tar
nixlib-afa4a27a2500519304f482460d5e879018d3ba56.tar.gz
nixlib-afa4a27a2500519304f482460d5e879018d3ba56.tar.bz2
nixlib-afa4a27a2500519304f482460d5e879018d3ba56.tar.lz
nixlib-afa4a27a2500519304f482460d5e879018d3ba56.tar.xz
nixlib-afa4a27a2500519304f482460d5e879018d3ba56.tar.zst
nixlib-afa4a27a2500519304f482460d5e879018d3ba56.zip
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.
-rw-r--r--pkgs/applications/networking/dropbox-cli/default.nix4
1 files 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"
   '';