diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-25 23:52:53 -0400 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-05-17 16:15:32 -0400 |
| commit | 76667036ecb84d299424d0cba345b83040e869ae (patch) | |
| tree | 7315c8724dae5d8704f610d34d40e36b9785c31b /pkgs/development/libraries/gmp | |
| parent | 80ed251f176aefa4c31a93ebb550df009d9bb49e (diff) | |
| download | nixpkgs-76667036ecb84d299424d0cba345b83040e869ae.tar nixpkgs-76667036ecb84d299424d0cba345b83040e869ae.tar.gz nixpkgs-76667036ecb84d299424d0cba345b83040e869ae.tar.bz2 nixpkgs-76667036ecb84d299424d0cba345b83040e869ae.tar.lz nixpkgs-76667036ecb84d299424d0cba345b83040e869ae.tar.xz nixpkgs-76667036ecb84d299424d0cba345b83040e869ae.tar.zst nixpkgs-76667036ecb84d299424d0cba345b83040e869ae.zip | |
gmp 6: Fix for cross
Diffstat (limited to 'pkgs/development/libraries/gmp')
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index e30c15e629e..92dd602fc4d 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }: +{ stdenv, fetchurl, m4, cxx ? true +, buildPackages +, buildPlatform, hostPlatform +, withStatic ? false }: let inherit (stdenv.lib) optional optionalString; in @@ -16,7 +19,8 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; passthru.static = self.out; - nativeBuildInputs = [ m4 ]; + nativeBuildInputs = [ m4 ] + ++ stdenv.lib.optional (buildPlatform != hostPlatform) buildPackages.stdenv.cc; configureFlags = # Build a "fat binary", with routines for several sub-architectures @@ -39,7 +43,7 @@ let self = stdenv.mkDerivation rec { configureFlagsArray+=("--build=$(./configfsf.guess)") ''; - doCheck = true; + doCheck = buildPlatform == hostPlatform; dontDisableStatic = withStatic; |