diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-28 09:05:12 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-28 09:05:12 +0200 |
commit | 8ffe6817134e6ccbad2cd1a69a420182649938cd (patch) | |
tree | 8b5462b966bb0acbdf53b712915a77402eb36310 | |
parent | eb4a9d4d9ca526f8d4c4fab64545b147ce1da31b (diff) | |
download | nixpkgs-8ffe6817134e6ccbad2cd1a69a420182649938cd.tar nixpkgs-8ffe6817134e6ccbad2cd1a69a420182649938cd.tar.gz nixpkgs-8ffe6817134e6ccbad2cd1a69a420182649938cd.tar.bz2 nixpkgs-8ffe6817134e6ccbad2cd1a69a420182649938cd.tar.lz nixpkgs-8ffe6817134e6ccbad2cd1a69a420182649938cd.tar.xz nixpkgs-8ffe6817134e6ccbad2cd1a69a420182649938cd.tar.zst nixpkgs-8ffe6817134e6ccbad2cd1a69a420182649938cd.zip |
qt4-clang: fix fallout from f9b5ed66d10
There's still the question of Hydra binaries etc. but this should at least fix evaluation and running problems.
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1fc1bc4336..9c458eb9130 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13551,7 +13551,7 @@ in siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - qt4 = qt4.override { + qt4 = pkgsi686Linux.qt4.override { stdenv = clangStdenv; }; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 94dabc76f16..cc1e9b791f7 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -184,7 +184,6 @@ let pythonFull = linux; sbcl = linux; qt3 = linux; - qt4-clang = [ "i686-linux" ]; quake3demo = linux; reiserfsprogs = linux; rubber = allBut cygwin; |