dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

skype: return to stock qt4

Browse Source 
Fix a SIGABRT, also finally get rid of qt4_clang.
This commit is contained in:
Nikolay Amiantov 2016-12-07 01:44:34 +03:00
parent 5373ca9712
commit c182733691
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };