From 8ffe6817134e6ccbad2cd1a69a420182649938cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 28 Mar 2016 09:05:12 +0200
Subject: [PATCH] qt4-clang: fix fallout from f9b5ed66d10

There's still the question of Hydra binaries etc. but this should at
least fix evaluation and running problems.
---
 pkgs/top-level/all-packages.nix | 2 +-
 pkgs/top-level/release.nix      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1fc1bc43362..9c458eb9130c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13551,7 +13551,7 @@ in
   siproxd = callPackage ../applications/networking/siproxd { };
 
   skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
-    qt4 = qt4.override {
+    qt4 = pkgsi686Linux.qt4.override {
       stdenv = clangStdenv;
     };
   };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 94dabc76f164..cc1e9b791f77 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -184,7 +184,6 @@ let
       pythonFull = linux;
       sbcl = linux;
       qt3 = linux;
-      qt4-clang = [ "i686-linux" ];
       quake3demo = linux;
       reiserfsprogs = linux;
       rubber = allBut cygwin;