nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline qt4-clang

Browse Source 
This prevents a potential name/version conflict in nix-env, and a
large Hydra build for a proprietary package.
This commit is contained in:
Eelco Dolstra 2016-03-27 23:31:08 +02:00
parent 38afa836b3
commit f9b5ed66d1
1 changed files with 3 additions and 5 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,12 +13548,10 @@ in
siproxd = callPackage ../applications/networking/siproxd { };
# Needed for skype
qt4-clang = qt4.override {
stdenv = clangStdenv;
};
skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
qt4 = pkgsi686Linux.qt4-clang;
qt4 = qt4.override {
stdenv = clangStdenv;
};
};
skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { };