public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetic changes to newsreaders/kwooty and dropbox expressions.

Browse Source 
svn path=/nixpkgs/trunk/; revision=32689
This commit is contained in:
Arie Middelkoop 2012-02-29 12:54:35 +00:00
parent 6e8c9ea906
commit 45120513fb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/dropbox/default.nix
View File

@ -23,7 +23,7 @@ let
sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252"; sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252";
# relative location where the dropbox libraries are stored # relative location where the dropbox libraries are stored
sharedir = "share/dropbox"; appdir = "opt/dropbox";
# Libraries referenced by dropbox binary. # Libraries referenced by dropbox binary.
# Be aware that future versions of the dropbox binary may refer # Be aware that future versions of the dropbox binary may refer
@ -60,17 +60,17 @@ in stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
ensureDir "$out/${sharedir}" ensureDir "$out/${appdir}"
cp -r .dropbox-dist/* "$out/${sharedir}/" cp -r .dropbox-dist/* "$out/${appdir}/"
ensureDir "$out/bin" 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 \ 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" 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" {} \; -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
ensureDir "$out/share/applications" ensureDir "$out/share/applications"

2
pkgs/applications/networking/newsreaders/kwooty/default.nix
View File

@ -32,7 +32,7 @@ in stdenv.mkDerivation {
libX11 libXext libXft libX11 libXext libXft
]; ];
meta = with stdenv.lib; { meta = {
description = "Binary news reader of KDE"; description = "Binary news reader of KDE";
}; };
} }