diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-03-31 13:49:58 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-31 13:49:58 +0400 |
| commit | 594cd3bf5e404dd63bf890d26632f3420f62d04e (patch) | |
| tree | 2b38d06c7a5e7093ea896758572a6622274d6988 | |
| parent | 149b9faac0b5411ae91631fe0c9249942e6ab4b4 (diff) | |
| parent | 7f69d5ed8c47beafc04efb88aeb818b84b48c2e2 (diff) | |
| download | nixpkgs-594cd3bf5e404dd63bf890d26632f3420f62d04e.tar nixpkgs-594cd3bf5e404dd63bf890d26632f3420f62d04e.tar.gz nixpkgs-594cd3bf5e404dd63bf890d26632f3420f62d04e.tar.bz2 nixpkgs-594cd3bf5e404dd63bf890d26632f3420f62d04e.tar.lz nixpkgs-594cd3bf5e404dd63bf890d26632f3420f62d04e.tar.xz nixpkgs-594cd3bf5e404dd63bf890d26632f3420f62d04e.tar.zst nixpkgs-594cd3bf5e404dd63bf890d26632f3420f62d04e.zip | |
Merge pull request #14337 from dguibert/fix/skype
skype: build qt4 with the 32bits clangStdenv
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bded90df6a4..b35c94d692f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13631,7 +13631,7 @@ in skype = callPackage_i686 ../applications/networking/instant-messengers/skype { qt4 = pkgsi686Linux.qt4.override { - stdenv = clangStdenv; + stdenv = pkgsi686Linux.clangStdenv; }; }; |