skype: return to stock qt4

Fix a SIGABRT, also finally get rid of qt4_clang.
NixOS · Dec 6, 2016 · c182733 · c182733
1 parent 5373ca9
commit c182733
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -8964,8 +8964,6 @@ in
 
   qt4 = pkgs.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;
@@ -14565,9 +14563,7 @@ in
 
   siproxd = callPackage ../applications/networking/siproxd { };
 
-  skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
-    qt4 = pkgsi686Linux.qt4_clang;
-  };
+  skype = callPackage_i686 ../applications/networking/instant-messengers/skype { };
 
   skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };