Merge pull request #27696 from dtzWill/fix/one-skype-to-call-them-all

skype: remove deprecated

3 files changed, 1 insertions, 72 deletions

diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
deleted file mode 100644
index a84b9cbf31c1..000000000000
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
-, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
-, libpulseaudio, lib, ... }:
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation rec {
-  name = "skype-4.3.0.37";
-
-  src = fetchurl {
-    url = "http://download.skype.com/linux/${name}.tar.bz2";
-    sha256 = "0bc9kck99rcsqzxzw3j6vnw5byvr8c9wixrx609zp255g0wxr6cc";
-  };
-
-  buildInputs = [
-    stdenv.glibc
-    stdenv.cc.cc
-    libXv
-    libXext
-    libX11
-    qt4
-    libXScrnSaver
-    libSM
-    libICE
-    libXi
-    libXrender
-    libXrandr
-    libpulseaudio
-    freetype
-    fontconfig
-    zlib
-    glib
-  ];
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = ''
-    mkdir -p $out/{libexec/skype/,bin}
-    cp -r * $out/libexec/skype/
-
-    # Fix execution on PaX-enabled kernels
-    paxmark m $out/libexec/skype/skype
-
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype
-
-    cat > $out/bin/skype << EOF
-    #!${stdenv.shell}
-    export PULSE_LATENCY_MSEC=60  # workaround for pulseaudio glitches
-    exec $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
-    EOF
-
-    chmod +x $out/bin/skype
-
-    # Fixup desktop file
-    substituteInPlace skype.desktop --replace \
-      "Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_128x128.png"
-    substituteInPlace skype.desktop --replace \
-      "Terminal=0" "Terminal=false"
-    mkdir -p $out/share/applications
-    mv skype.desktop $out/share/applications
-  '';
-
-  meta = {
-    description = "A proprietary voice-over-IP (VoIP) client";
-    homepage = http://www.skype.com/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = [ "i686-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c47e3fe325bf..49ba2d0ccdf8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -129,6 +129,7 @@ mapAliases (rec {
   saneFrontends = sane-frontends; # added 2016-01-02
   scim = sc-im; # added 2016-01-22
   skrooge2 = skrooge; # added 2017-02-18
+  skype = skypeforlinux; # added 2017-07-27
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d4e407dde73..f628658c0efb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15980,8 +15980,6 @@ with pkgs;
 
   siproxd = callPackage ../applications/networking/siproxd { };
 
-  skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
-
   skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { };
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };