public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14246 from abbradar/skype-workaround

Browse Source 
skype: use clang-built qt4 to fix segfault
This commit is contained in:
Domen Kožar 2016-03-27 20:21:29 +01:00
commit e4c33a688d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13548,7 +13548,13 @@ in
siproxd = callPackage ../applications/networking/siproxd { }; siproxd = callPackage ../applications/networking/siproxd { };
skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; # Needed for skype
qt4-clang = qt4.override {
stdenv = clangStdenv;
};
skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
qt4 = pkgsi686Linux.qt4-clang;
};
skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };

1
pkgs/top-level/release.nix
View File

@ -184,6 +184,7 @@ let
pythonFull = linux; pythonFull = linux;
sbcl = linux; sbcl = linux;
qt3 = linux; qt3 = linux;
qt4-clang = [ "i686-linux" ];
quake3demo = linux; quake3demo = linux;
reiserfsprogs = linux; reiserfsprogs = linux;
rubber = allBut cygwin; rubber = allBut cygwin;