diff options
author | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-29 12:54:35 +0000 |
---|---|---|
committer | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-29 12:54:35 +0000 |
commit | 45120513fb73699a0bbeccf26e61d86bad1868d3 (patch) | |
tree | 1dd0768856a33749a5fa47eb5398a9047b6ce985 /pkgs/applications/networking/dropbox | |
parent | 6e8c9ea906e80e6af78f1ec74213787dac0ad354 (diff) | |
download | nixlib-45120513fb73699a0bbeccf26e61d86bad1868d3.tar nixlib-45120513fb73699a0bbeccf26e61d86bad1868d3.tar.gz nixlib-45120513fb73699a0bbeccf26e61d86bad1868d3.tar.bz2 nixlib-45120513fb73699a0bbeccf26e61d86bad1868d3.tar.lz nixlib-45120513fb73699a0bbeccf26e61d86bad1868d3.tar.xz nixlib-45120513fb73699a0bbeccf26e61d86bad1868d3.tar.zst nixlib-45120513fb73699a0bbeccf26e61d86bad1868d3.zip |
Cosmetic changes to newsreaders/kwooty and dropbox expressions.
svn path=/nixpkgs/trunk/; revision=32689
Diffstat (limited to 'pkgs/applications/networking/dropbox')
-rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 5e7e921710f0..936fedd1491e 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,7 +23,7 @@ let sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252"; # relative location where the dropbox libraries are stored - sharedir = "share/dropbox"; + appdir = "opt/dropbox"; # Libraries referenced by dropbox binary. # Be aware that future versions of the dropbox binary may refer @@ -60,17 +60,17 @@ in stdenv.mkDerivation { ''; installPhase = '' - ensureDir "$out/${sharedir}" - cp -r .dropbox-dist/* "$out/${sharedir}/" + ensureDir "$out/${appdir}" + cp -r .dropbox-dist/* "$out/${appdir}/" ensureDir "$out/bin" - ln -s "$out/${sharedir}/dropbox" "$out/bin/dropbox" + ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox" patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \ - "$out/${sharedir}/dropbox" + "$out/${appdir}/dropbox" - RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${sharedir} + RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${appdir} echo "updating rpaths to: $RPATH" - find "$out/${sharedir}" -type f -a -perm +0100 \ + find "$out/${appdir}" -type f -a -perm +0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; ensureDir "$out/share/applications" |