alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

glibc: Grab the right linux headers when build != host

Browse source 
In #28519 / 791ce593ce 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 25edc476fd and its
parent.

No native hashes are changed.
This commit is contained in:
John Ericson 2017-09-20 20:27:43 -04:00
parent 19e3c580ad
commit 8bfb247224
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/glibc/common.nix
View file

@ -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";