ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-07 14:00:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73203 from veprbl/pr/arrow-cpp_i686

Browse Source 
arrow-cpp: fix on i686-linux
This commit is contained in:
Dmitry Kalinkin 2019-11-11 04:15:29 -05:00 committed by GitHub
commit 418f5506e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };