diff options
| author | John Ericson <git@JohnEricson.me> | 2018-10-24 10:35:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 10:35:52 -0400 |
| commit | 7d96d1502015877d12a816658f0bf3bfc7540129 (patch) | |
| tree | e982d6ea4c29a6abe026422cea5248ffdb101038 /pkgs/development/libraries | |
| parent | 6615b769961a1ff4413f0d9c64d325216184dec7 (diff) | |
| parent | bbd12f558367034c77c68795c88b01b9cf5705dd (diff) | |
| download | nixlib-7d96d1502015877d12a816658f0bf3bfc7540129.tar nixlib-7d96d1502015877d12a816658f0bf3bfc7540129.tar.gz nixlib-7d96d1502015877d12a816658f0bf3bfc7540129.tar.bz2 nixlib-7d96d1502015877d12a816658f0bf3bfc7540129.tar.lz nixlib-7d96d1502015877d12a816658f0bf3bfc7540129.tar.xz nixlib-7d96d1502015877d12a816658f0bf3bfc7540129.tar.zst nixlib-7d96d1502015877d12a816658f0bf3bfc7540129.zip | |
Merge pull request #46534 from obsidiansystems/darwin-to-linux-cross
misc pkgs: Darwin -> Linux cross compilation
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a7a4c2fbacdb..b77c450bdec1 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -133,7 +133,9 @@ stdenv.mkDerivation ({ depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ]; - buildInputs = lib.optionals withGd [ gd libpng ]; + # TODO make linuxHeaders unconditional next mass rebuild + buildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) linuxHeaders + ++ lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # prevent a retained dependency on the bootstrap tools in the stdenv-linux |