Inline qt4-clang

This prevents a potential name/version conflict in nix-env, and a
large Hydra build for a proprietary package.

(cherry picked from commit f9b5ed66d10af4ace464b1031ee3b18bc6c8509d)

1 files changed, 3 insertions, 5 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cb8db710c77d..89b04dd3c0a68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13556,12 +13556,10 @@ let
 
   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 { };