From 03e78496b6ff3dd0524422de0fe8864fb22896e2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 11 Nov 2019 03:23:09 -0500 Subject: [PATCH] arrow-cpp: fix on i686-linux --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fe2129fef67..881b4fce2c42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10577,9 +10577,11 @@ in stdenv = gcc6Stdenv; }; - arrow-cpp = callPackage ../development/libraries/arrow-cpp { + arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ gtest = gtest.override { static = true; }; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' + }); assimp = callPackage ../development/libraries/assimp { };