Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

skypeforlinux: 5.5.0.1 -> 8.11.0.4 #31466

Merged
merged 1 commit into from
Nov 27, 2017
Merged

skypeforlinux: 5.5.0.1 -> 8.11.0.4 #31466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 10 additions & 11 deletions pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Open in desktop
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, 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
Expand All @@ -17,9 +17,8 @@ let
fontconfig
freetype
glib
libsecret
glibc
libstdcxx5
libsecret

gnome2.GConf
gnome2.gdk_pixbuf
Expand All @@ -29,10 +28,12 @@ let
gnome2.gnome_keyring

libnotify
libpulseaudio
nspr
nss
stdenv.cc.cc
systemd
libstdcxx5
libv4l

xorg.libxkbfile
Expand All @@ -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}";
Expand Down Expand Up @@ -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"
Expand All @@ -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" ];
};
}