diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adfd300d3fa..1254917f08e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8567,6 +8567,8 @@ in qt4 = self.kde4.qt4; + qt4_clang = lowPrio (self.qt4.override { stdenv = clangStdenv; }); + qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true mesa = mesa_noglu; @@ -13811,9 +13813,7 @@ in siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - qt4 = pkgsi686Linux.qt4.override { - stdenv = pkgsi686Linux.clangStdenv; - }; + 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 dcdd27bfe50..763e891173c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -182,6 +182,7 @@ let pythonFull = linux; sbcl = linux; qt3 = linux; + qt4_clang = ["i686-linux"]; quake3demo = linux; reiserfsprogs = linux; rubber = allBut cygwin;