Skip to content

Commit

Permalink
update skypeforlinux to 5.4.0.1; Fix autologin issue (#29122)
Browse files Browse the repository at this point in the history
skypeforlinux: 5.3.0.1 -> 5.4.0.1
  • Loading branch information
PanAeon authored and Mic92 committed Sep 8, 2017
1 parent 653cad7 commit 5d1a8ec
Showing 1 changed file with 12 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
, libnotify, nspr, nss, systemd, xorg }:
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2, libsecret
, libnotify, nspr, nss, systemd, xorg, libv4l, libstdcxx5 }:

let

version = "5.3.0.1";
version = "5.4.0.1";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
Expand All @@ -17,6 +17,9 @@ let
fontconfig
freetype
glib
libsecret
glibc
libstdcxx5

gnome2.GConf
gnome2.gdk_pixbuf
Expand All @@ -30,6 +33,7 @@ let
nss
stdenv.cc.cc
systemd
libv4l

xorg.libxkbfile
xorg.libX11
Expand All @@ -50,7 +54,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
sha256 = "08sf9nqnznsydw4965w7ixwwba54hjc02ga7vcnz9vpx5hln3nrz";
sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";
Expand All @@ -77,9 +81,10 @@ in stdenv.mkDerivation {
'';

postFixup = ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux"
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
done
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
Expand Down

1 comment on commit 5d1a8ec

@Mic92
Copy link
Member

@Mic92 Mic92 commented on 5d1a8ec Sep 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh github changes it's behavior on squashing commits,
when merging. It used the take the pull request title as a commit title.

Please sign in to comment.