Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5793e97e6e25
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 331efb3d74bc
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 24, 2017

  1. Copy the full SHA
    18de0c3 View commit details
  2. Merge pull request #25155 from PanAeon/feature-skypeforlinux

    add skypeforlinux beta (new)
    Mic92 authored Apr 24, 2017
    Copy the full SHA
    331efb3 View commit details
Showing with 104 additions and 0 deletions.
  1. +1 −0 lib/maintainers.nix
  2. +101 −0 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions lib/maintainers.nix
Original file line number Diff line number Diff line change
@@ -388,6 +388,7 @@
paholg = "Paho Lurie-Gregg <paho@paholg.com>";
pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
palo = "Ingolf Wanger <palipalo9@googlemail.com>";
panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com";
paperdigits = "Mica Semrick <mica@silentumbrella.com>";
pashev = "Igor Pashev <pashev.igor@gmail.com>";
patternspandemic = "Brad Christensen <patternspandemic@live.com>";
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
, libnotify, nspr, nss, systemd, xorg }:

let

version = "5.1.0.1";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
atk
cairo
cups
curl
dbus
expat
fontconfig
freetype
glib

gnome2.GConf
gnome2.gdk_pixbuf
gnome2.gtk
gnome2.pango

gnome2.gnome_keyring

libnotify
nspr
nss
stdenv.cc.cc
systemd

xorg.libxkbfile
xorg.libX11
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libXScrnSaver
xorg.libxcb
] + ":${stdenv.cc.cc.lib}/lib64";

src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/latest/skypeforlinux-64.deb";
sha256 = "18v861x0n2q2jaglap8193sia476dwkwr0ccfzl29mi5ijma24ml";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";

in stdenv.mkDerivation {
name = "skypeforlinux-${version}";

system = "x86_64-linux";

inherit src;

buildInputs = [ dpkg makeWrapper ];

unpackPhase = "true";
installPhase = ''
mkdir -p $out
dpkg -x $src $out
cp -av $out/usr/* $out
rm -rf $out/opt $out/usr
rm $out/bin/skypeforlinux
# Otherwise it looks "suspicious"
chmod -R g-w $out
'';

postFixup = ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux"
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
# Fix the desktop link
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 ];
platforms = [ "x86_64-linux" ];
};
}

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -15477,6 +15477,8 @@ with pkgs;

skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };

skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { };

skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };

skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };