From 28af80fcc05fba494c2b0c143169cb47177ac704 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 27 Mar 2016 15:30:21 +0300
Subject: [PATCH] skype: use clang-built qt4 to fix segfault

---
 pkgs/top-level/all-packages.nix | 8 +++++++-
 pkgs/top-level/release.nix      | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 380b698236f..79eab4733a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13544,7 +13544,13 @@ in
 
   siproxd = callPackage ../applications/networking/siproxd { };
 
-  skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
+  # Needed for skype
+  qt4-clang = qt4.override {
+    stdenv = clangStdenv;
+  };
+  skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
+    qt4 = pkgsi686Linux.qt4-clang;
+  };
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cc1e9b791f7..94dabc76f16 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -184,6 +184,7 @@ let
       pythonFull = linux;
       sbcl = linux;
       qt3 = linux;
+      qt4-clang = [ "i686-linux" ];
       quake3demo = linux;
       reiserfsprogs = linux;
       rubber = allBut cygwin;