diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-20 20:27:43 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-20 20:57:41 -0400 |
| commit | 8bfb2472241a991934ff95bd7b57f0bd1c2194d2 (patch) | |
| tree | e06460c19572cac86bc0f61eb28109d384a7ca3d /pkgs/development/libraries/glibc | |
| parent | 19e3c580ad60319596cab44e1ed75640b69c09d4 (diff) | |
| download | nixpkgs-8bfb2472241a991934ff95bd7b57f0bd1c2194d2.tar nixpkgs-8bfb2472241a991934ff95bd7b57f0bd1c2194d2.tar.gz nixpkgs-8bfb2472241a991934ff95bd7b57f0bd1c2194d2.tar.bz2 nixpkgs-8bfb2472241a991934ff95bd7b57f0bd1c2194d2.tar.lz nixpkgs-8bfb2472241a991934ff95bd7b57f0bd1c2194d2.tar.xz nixpkgs-8bfb2472241a991934ff95bd7b57f0bd1c2194d2.tar.zst nixpkgs-8bfb2472241a991934ff95bd7b57f0bd1c2194d2.zip | |
glibc: Grab the right linux headers when build != host
In #28519 / 791ce593ce065cf074edf1509ff52ebc69136d9e I made linux headers be intended to be used from the stage stage, as it would be if it were a library containing headers and code. I forgot to update glibc, however, so it was incorrectly using headers for the build platform, not host platform. This fixes that, basically reverting a small portion of changes I made a few months ago in 25edc476fd9fe1bd8bedf571d218ba4f27fb5a27 and its parent. No native hashes are changed.
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -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 5cb627ed895..5c7bbb32c33 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"; |