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

skypeforlinux: fix borked cherry-picking

Browse Source
This commit is contained in:
Jan Tojnar 2018-08-19 15:06:43 +02:00
parent 3b2f3e59d1
commit 2801a299be
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View File

@ -83,6 +83,8 @@ in stdenv.mkDerivation {
rm -rf $out/opt $out/usr rm -rf $out/opt $out/usr
rm $out/bin/skypeforlinux rm $out/bin/skypeforlinux
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
# Otherwise it looks "suspicious" # Otherwise it looks "suspicious"
chmod -R g-w $out chmod -R g-w $out
''; '';
@ -93,12 +95,6 @@ in stdenv.mkDerivation {
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
done done
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
wrapProgram $out/bin/skypeforlinux \
--suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
# Fix the desktop link # Fix the desktop link
substituteInPlace $out/share/applications/skypeforlinux.desktop \ substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \ --replace /usr/bin/ $out/bin/ \