Merge pull request #25155 from PanAeon/feature-skypeforlinux

add skypeforlinux beta (new)

authored by

Jörg Thalheim and committed by
GitHub
331efb3d 5793e97e

+104
+1
lib/maintainers.nix
··· 388 388 paholg = "Paho Lurie-Gregg <paho@paholg.com>"; 389 389 pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>"; 390 390 palo = "Ingolf Wanger <palipalo9@googlemail.com>"; 391 + panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com"; 391 392 paperdigits = "Mica Semrick <mica@silentumbrella.com>"; 392 393 pashev = "Igor Pashev <pashev.igor@gmail.com>"; 393 394 patternspandemic = "Brad Christensen <patternspandemic@live.com>";
+101
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
··· 1 + { stdenv, fetchurl, dpkg, makeWrapper 2 + , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2 3 + , libnotify, nspr, nss, systemd, xorg }: 4 + 5 + let 6 + 7 + version = "5.1.0.1"; 8 + 9 + rpath = stdenv.lib.makeLibraryPath [ 10 + alsaLib 11 + atk 12 + cairo 13 + cups 14 + curl 15 + dbus 16 + expat 17 + fontconfig 18 + freetype 19 + glib 20 + 21 + gnome2.GConf 22 + gnome2.gdk_pixbuf 23 + gnome2.gtk 24 + gnome2.pango 25 + 26 + gnome2.gnome_keyring 27 + 28 + libnotify 29 + nspr 30 + nss 31 + stdenv.cc.cc 32 + systemd 33 + 34 + xorg.libxkbfile 35 + xorg.libX11 36 + xorg.libXcomposite 37 + xorg.libXcursor 38 + xorg.libXdamage 39 + xorg.libXext 40 + xorg.libXfixes 41 + xorg.libXi 42 + xorg.libXrandr 43 + xorg.libXrender 44 + xorg.libXtst 45 + xorg.libXScrnSaver 46 + xorg.libxcb 47 + ] + ":${stdenv.cc.cc.lib}/lib64"; 48 + 49 + src = 50 + if stdenv.system == "x86_64-linux" then 51 + fetchurl { 52 + url = "https://repo.skype.com/latest/skypeforlinux-64.deb"; 53 + sha256 = "18v861x0n2q2jaglap8193sia476dwkwr0ccfzl29mi5ijma24ml"; 54 + } 55 + else 56 + throw "Skype for linux is not supported on ${stdenv.system}"; 57 + 58 + in stdenv.mkDerivation { 59 + name = "skypeforlinux-${version}"; 60 + 61 + system = "x86_64-linux"; 62 + 63 + inherit src; 64 + 65 + buildInputs = [ dpkg makeWrapper ]; 66 + 67 + unpackPhase = "true"; 68 + installPhase = '' 69 + mkdir -p $out 70 + dpkg -x $src $out 71 + cp -av $out/usr/* $out 72 + rm -rf $out/opt $out/usr 73 + rm $out/bin/skypeforlinux 74 + 75 + # Otherwise it looks "suspicious" 76 + chmod -R g-w $out 77 + ''; 78 + 79 + postFixup = '' 80 + patchelf \ 81 + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ 82 + --set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux" 83 + 84 + ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" 85 + 86 + # Fix the desktop link 87 + substituteInPlace $out/share/applications/skypeforlinux.desktop \ 88 + --replace /usr/bin/ $out/bin/ \ 89 + --replace /usr/share/ $out/share/ 90 + 91 + ''; 92 + 93 + meta = with stdenv.lib; { 94 + description = "Linux client for skype"; 95 + homepage = "https://www.skype.com"; 96 + license = licenses.unfree; 97 + maintainers = with stdenv.lib.maintainers; [ panaeon ]; 98 + platforms = [ "x86_64-linux" ]; 99 + }; 100 + } 101 +
+2
pkgs/top-level/all-packages.nix
··· 15477 15477 15478 15478 skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; 15479 15479 15480 + skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; 15481 + 15480 15482 skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; 15481 15483 15482 15484 skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };