diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-09-20 21:13:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 21:13:54 -0400 |
| commit | df0c265ee1dd2bfef50b493be98047dc87dd977b (patch) | |
| tree | 76a21f6beef15042cf9e64a4f609cc9afb3a4d93 /pkgs | |
| parent | d58a88277d3cea20ce958fd404343f7e701ab970 (diff) | |
| parent | 8bfb2472241a991934ff95bd7b57f0bd1c2194d2 (diff) | |
| download | nixlib-df0c265ee1dd2bfef50b493be98047dc87dd977b.tar nixlib-df0c265ee1dd2bfef50b493be98047dc87dd977b.tar.gz nixlib-df0c265ee1dd2bfef50b493be98047dc87dd977b.tar.bz2 nixlib-df0c265ee1dd2bfef50b493be98047dc87dd977b.tar.lz nixlib-df0c265ee1dd2bfef50b493be98047dc87dd977b.tar.xz nixlib-df0c265ee1dd2bfef50b493be98047dc87dd977b.tar.zst nixlib-df0c265ee1dd2bfef50b493be98047dc87dd977b.zip | |
Merge pull request #29625 from obsidiansystems/linuxHeadersCross
glibc: Grab the right linux headers when build != host
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 5cb627ed8957..5c7bbb32c330 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -1,10 +1,12 @@ /* Build configuration used to build glibc, Info files, and locale information. */ -{ stdenv, lib, fetchurl -, gd ? null, libpng ? null +{ stdenv, lib , buildPlatform, hostPlatform , buildPackages +, fetchurl +, linuxHeaders ? null +, gd ? null, libpng ? null }: { name @@ -17,7 +19,6 @@ } @ args: let - inherit (buildPackages) linuxHeaders; version = "2.25"; patchSuffix = "-49"; sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0"; |