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

qt4-clang: fix fallout from f9b5ed66d1

Browse source 
There's still the question of Hydra binaries etc. but this should at
least fix evaluation and running problems.
This commit is contained in:
Vladimír Čunát 2016-03-28 09:05:12 +02:00
parent eb4a9d4d9c
commit 8ffe681713
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13551,7 +13551,7 @@ in
siproxd = callPackage ../applications/networking/siproxd { }; siproxd = callPackage ../applications/networking/siproxd { };
skype = callPackage_i686 ../applications/networking/instant-messengers/skype { skype = callPackage_i686 ../applications/networking/instant-messengers/skype {
qt4 = qt4.override { qt4 = pkgsi686Linux.qt4.override {
stdenv = clangStdenv; stdenv = clangStdenv;
}; };
}; };

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

@ -184,7 +184,6 @@ 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;