From f9b5ed66d10af4ace464b1031ee3b18bc6c8509d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 27 Mar 2016 23:31:08 +0200
Subject: [PATCH] Inline qt4-clang

This prevents a potential name/version conflict in nix-env, and a
large Hydra build for a proprietary package.
---
 pkgs/top-level/all-packages.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89f2ae1a19c3..fe654a12f79a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13548,12 +13548,10 @@ in
 
   siproxd = callPackage ../applications/networking/siproxd { };
 
-  # Needed for skype
-  qt4-clang = qt4.override {
-    stdenv = clangStdenv;
-  };
   skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
-    qt4 = pkgsi686Linux.qt4-clang;
+    qt4 = qt4.override {
+      stdenv = clangStdenv;
+    };
   };
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };