skypeforlinux: fix borked cherry-picking

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

View file

@ -83,6 +83,8 @@ in stdenv.mkDerivation {
rm -rf $out/opt $out/usr
rm $out/bin/skypeforlinux
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
# Otherwise it looks "suspicious"
chmod -R g-w $out
'';
@ -93,12 +95,6 @@ in stdenv.mkDerivation {
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
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
substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \