swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt4: add a toplevel entry for the version skype uses

Browse source 
Otherwise, it won't get built by hydra

abbradar: use `self` as needed for overrides.
This commit is contained in:
obadz 2016-04-15 23:22:41 +01:00 committed by Nikolay Amiantov
parent 5e2bb0b31c
commit 98a7f819d9
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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