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

Merge pull request #31466 from jraygauthier/jrg/skypeforlinux_was_broken_update_to_latest

Browse Source 
skypeforlinux: 5.5.0.1 -> 8.11.0.4
This commit is contained in:
Orivej Desh 2017-11-27 16:30:14 +00:00 committed by GitHub
commit 6158563b45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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" ];
};
}