skypeforlinux: 8.110.76.107 -> 8.119.0.201
Skype is now distributed as a SNAP package https://answers.microsoft.com/en-us/skype/forum/all/skype-for-linux-updates/da864865-d9e9-4819-8a5d-8de8934dd312
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
dpkg,
|
squashfsTools,
|
||||||
alsa-lib,
|
alsa-lib,
|
||||||
atk,
|
atk,
|
||||||
cairo,
|
cairo,
|
||||||
@@ -41,7 +41,8 @@ let
|
|||||||
|
|
||||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||||
# source of the latter disappears much faster.
|
# source of the latter disappears much faster.
|
||||||
version = "8.110.76.107";
|
version = "8.119.0.201";
|
||||||
|
revision = "348";
|
||||||
|
|
||||||
rpath =
|
rpath =
|
||||||
lib.makeLibraryPath [
|
lib.makeLibraryPath [
|
||||||
@@ -99,12 +100,9 @@ let
|
|||||||
src =
|
src =
|
||||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
urls = [
|
name = "skypeforlinux-${version}-${revision}.snap";
|
||||||
"https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
|
||||||
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
hash = "sha512-sHbLmpF+5qaKTUArHceqv91NJxNpflQE2ojO9sepQBhXacn66hluC7cGb7toQnteYKUsx00TBYs2Ugk/BkT0uA==";
|
||||||
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
|
||||||
];
|
|
||||||
sha256 = "sha256-ocXhISwEtwzPd1dOPjgIj5UQ/8sqq2gUtmZ8KZBAxKM=";
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||||
@@ -112,7 +110,7 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "skypeforlinux";
|
pname = "skypeforlinux";
|
||||||
inherit version;
|
inherit version revision;
|
||||||
|
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
||||||
@@ -123,20 +121,27 @@ stdenv.mkDerivation {
|
|||||||
glib # For setup hook populating GSETTINGS_SCHEMA_PATH
|
glib # For setup hook populating GSETTINGS_SCHEMA_PATH
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ dpkg ];
|
buildInputs = [ squashfsTools ];
|
||||||
|
|
||||||
|
unpackPhase = ''
|
||||||
|
runHook preUnpack
|
||||||
|
|
||||||
|
unsquashfs "$src" /meta/{'gui/*.desktop',snap.yaml} \
|
||||||
|
/usr/share/{doc/skypeforlinux,'icons/hicolor/*/apps/skypeforlinux.png',kservices5,pixmaps,skypeforlinux}
|
||||||
|
sourceRoot=squashfs-root
|
||||||
|
|
||||||
|
runHook postUnpack
|
||||||
|
'';
|
||||||
|
|
||||||
dontUnpack = true;
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out
|
runHook preInstall
|
||||||
dpkg -x $src $out
|
|
||||||
cp -av $out/usr/* $out
|
|
||||||
rm -rf $out/opt $out/usr
|
|
||||||
rm $out/bin/skypeforlinux
|
|
||||||
|
|
||||||
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
|
mkdir -p "$out/bin"
|
||||||
|
mv meta/gui usr/share/applications
|
||||||
|
mv meta/snap.yaml usr/share "$out"
|
||||||
|
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin"
|
||||||
|
|
||||||
# Otherwise it looks "suspicious"
|
runHook postInstall
|
||||||
chmod -R g-w $out
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
@@ -146,20 +151,20 @@ stdenv.mkDerivation {
|
|||||||
done
|
done
|
||||||
|
|
||||||
# Fix the desktop link
|
# Fix the desktop link
|
||||||
substituteInPlace $out/share/applications/skypeforlinux.desktop \
|
substituteInPlace "$out/share/applications/"*.desktop \
|
||||||
--replace /usr/bin/ ""
|
--replace-fail 'Exec=skype ' 'Exec=skypeforlinux ' \
|
||||||
substituteInPlace $out/share/applications/skypeforlinux-share.desktop \
|
--replace-fail 'Icon=''${SNAP}/meta/gui/skypeforlinux.png' 'Icon=skypeforlinux'
|
||||||
--replace /usr/bin/ ""
|
substituteInPlace "$out/share/kservices5/ServiceMenus/skypeforlinux.desktop" \
|
||||||
substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \
|
--replace-fail 'Exec=/usr/bin/skypeforlinux ' 'Exec=skypeforlinux '
|
||||||
--replace /usr/bin/ ""
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "Linux client for skype";
|
description = "Linux client for Skype";
|
||||||
homepage = "https://www.skype.com";
|
homepage = "https://www.skype.com";
|
||||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
changelog = "https://support.microsoft.com/en-us/skype/what-s-new-in-skype-for-windows-mac-linux-and-web-d32f674c-abb3-40a5-a0b7-ee269ca60831";
|
||||||
license = licenses.unfree;
|
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||||
maintainers = with maintainers; [
|
license = lib.licenses.unfree;
|
||||||
|
maintainers = with lib.maintainers; [
|
||||||
panaeon
|
panaeon
|
||||||
jraygauthier
|
jraygauthier
|
||||||
];
|
];
|
||||||
|
|||||||
Reference in New Issue
Block a user