diff options
| author | obadz <dav-github@odav.org> | 2016-04-15 23:22:41 +0100 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-28 16:49:07 +0300 |
| commit | 98a7f819d9ad0f8799b14232c4b979fb604aa53e (patch) | |
| tree | 056d6510403d939382adcbe6bf11d86b795073cb /pkgs/top-level | |
| parent | 5e2bb0b31c892fed5024eaf7e93faf470a6ceb38 (diff) | |
| download | nixlib-98a7f819d9ad0f8799b14232c4b979fb604aa53e.tar nixlib-98a7f819d9ad0f8799b14232c4b979fb604aa53e.tar.gz nixlib-98a7f819d9ad0f8799b14232c4b979fb604aa53e.tar.bz2 nixlib-98a7f819d9ad0f8799b14232c4b979fb604aa53e.tar.lz nixlib-98a7f819d9ad0f8799b14232c4b979fb604aa53e.tar.xz nixlib-98a7f819d9ad0f8799b14232c4b979fb604aa53e.tar.zst nixlib-98a7f819d9ad0f8799b14232c4b979fb604aa53e.zip | |
qt4: add a toplevel entry for the version skype uses
Otherwise, it won't get built by hydra abbradar: use `self` as needed for overrides.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adfd300d3fa1..1254917f08e5 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 dcdd27bfe50e..763e891173c7 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; |