diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-06 13:58:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-06 13:58:45 +0200 |
| commit | e68633cd7270b01c6a02196054335090d6c13455 (patch) | |
| tree | 3847b1167dafc6480673c05b22624c13dd91acf4 /pkgs/top-level/all-packages.nix | |
| parent | fa5d543770970b16da8585b5f1c4125c4bc5b5f3 (diff) | |
| parent | 477fa42be6a96d9bca9db36236fca37a238d4011 (diff) | |
| download | nixlib-e68633cd7270b01c6a02196054335090d6c13455.tar nixlib-e68633cd7270b01c6a02196054335090d6c13455.tar.gz nixlib-e68633cd7270b01c6a02196054335090d6c13455.tar.bz2 nixlib-e68633cd7270b01c6a02196054335090d6c13455.tar.lz nixlib-e68633cd7270b01c6a02196054335090d6c13455.tar.xz nixlib-e68633cd7270b01c6a02196054335090d6c13455.tar.zst nixlib-e68633cd7270b01c6a02196054335090d6c13455.zip | |
Merge branch 'master' into staging
The missing maintainer entry is blocking evaluation on Hydra.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fae3ed1ca248..e6e65cee66e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5048,6 +5048,9 @@ with pkgs; cross = targetPlatform; crossStageStatic = false; + # XXX: We have troubles cross-compiling libstdc++ on MinGW (see + # <http://hydra.nixos.org/build/4268232>), so don't even try. + langCC = targetPlatform.config != "i686-pc-mingw32"; # Why is this needed? inherit (forcedNativePackages) binutils; }; |