diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-27 16:30:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 16:30:14 +0000 |
| commit | 6158563b4524fe268c1d5133e8a79c44e310fb0d (patch) | |
| tree | 73ef09ef8acc212a4a29bf1f15f91a9c12796333 | |
| parent | d070942654f780788660933b0a5e957c08d77982 (diff) | |
| parent | f7ac0760a14999837462e7338ef81e5632c93b2f (diff) | |
| download | nixlib-6158563b4524fe268c1d5133e8a79c44e310fb0d.tar nixlib-6158563b4524fe268c1d5133e8a79c44e310fb0d.tar.gz nixlib-6158563b4524fe268c1d5133e8a79c44e310fb0d.tar.bz2 nixlib-6158563b4524fe268c1d5133e8a79c44e310fb0d.tar.lz nixlib-6158563b4524fe268c1d5133e8a79c44e310fb0d.tar.xz nixlib-6158563b4524fe268c1d5133e8a79c44e310fb0d.tar.zst nixlib-6158563b4524fe268c1d5133e8a79c44e310fb0d.zip | |
Merge pull request #31466 from jraygauthier/jrg/skypeforlinux_was_broken_update_to_latest
skypeforlinux: 5.5.0.1 -> 8.11.0.4
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index bfccc4bfcb6c..b92bf50b315b 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, dpkg, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2, libsecret -, libnotify, nspr, nss, systemd, xorg, libv4l, libstdcxx5 }: +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2 +, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, systemd, xorg }: let - version = "5.5.0.1"; + version = "8.11.0.4"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -17,9 +17,8 @@ let fontconfig freetype glib - libsecret glibc - libstdcxx5 + libsecret gnome2.GConf gnome2.gdk_pixbuf @@ -29,10 +28,12 @@ let gnome2.gnome_keyring libnotify + libpulseaudio nspr nss stdenv.cc.cc systemd + libstdcxx5 libv4l xorg.libxkbfile @@ -54,7 +55,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 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr"; + sha256 = "1dq7k4zlqqsx7786phialia5xbpc3cp1wrjhqrvga09yg4dl505c"; } else throw "Skype for linux is not supported on ${stdenv.system}"; @@ -82,8 +83,8 @@ in stdenv.mkDerivation { postFixup = '' 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 + 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" @@ -92,15 +93,13 @@ in stdenv.mkDerivation { substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ \ --replace /usr/share/ $out/share/ - ''; meta = with stdenv.lib; { description = "Linux client for skype"; homepage = https://www.skype.com; license = licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ panaeon ]; + maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; }; } - |