diff options
author | markuskowa <markus.kowalewski@gmail.com> | 2019-12-19 23:43:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-19 23:43:11 +0100 |
commit | 2783a1025a92708bdc769678a835ad66c0f9d03c (patch) | |
tree | c356c7b4dedbeba35624646b5841680b6c5226db /pkgs | |
parent | 8944ecb997d36fd50312bf4c457d548fdf0a2f9b (diff) | |
parent | c437dbf634f867fba23843bc56460dfa50993e00 (diff) | |
download | nixpkgs-2783a1025a92708bdc769678a835ad66c0f9d03c.tar nixpkgs-2783a1025a92708bdc769678a835ad66c0f9d03c.tar.gz nixpkgs-2783a1025a92708bdc769678a835ad66c0f9d03c.tar.bz2 nixpkgs-2783a1025a92708bdc769678a835ad66c0f9d03c.tar.lz nixpkgs-2783a1025a92708bdc769678a835ad66c0f9d03c.tar.xz nixpkgs-2783a1025a92708bdc769678a835ad66c0f9d03c.tar.zst nixpkgs-2783a1025a92708bdc769678a835ad66c0f9d03c.zip |
Merge pull request #76050 from robertodr/arrayfire
arrayfire: build with current gcc version
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e0f2060ef3..975775ae985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10729,10 +10729,7 @@ in armadillo = callPackage ../development/libraries/armadillo {}; - arrayfire = callPackage ../development/libraries/arrayfire { - # fails to build with gcc >= 7 - stdenv = gcc6Stdenv; - }; + arrayfire = callPackage ../development/libraries/arrayfire {}; arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ gtest = gtest.override { static = true; }; |