mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
glibc, kernel-headers: Fix some eval errors on Darwin
Need to get the source to get elf.h
This commit is contained in:
parent
d7e3dbef66
commit
846b44b2e9
@ -5,8 +5,6 @@
|
||||
, withGd ? false
|
||||
}:
|
||||
|
||||
assert stdenv.cc.isGNU;
|
||||
|
||||
callPackage ./common.nix { inherit stdenv; } {
|
||||
name = "glibc" + stdenv.lib.optionalString withGd "-gd";
|
||||
|
||||
@ -96,7 +94,8 @@ callPackage ./common.nix { inherit stdenv; } {
|
||||
mv $bin/bin/getconf_ $bin/bin/getconf
|
||||
'';
|
||||
|
||||
separateDebugInfo = true;
|
||||
# Hack to get around eval issue.
|
||||
separateDebugInfo = !stdenv.isDarwin;
|
||||
|
||||
meta.description = "The GNU C Library";
|
||||
}
|
||||
|
@ -2,8 +2,6 @@
|
||||
, fetchurl, perl
|
||||
}:
|
||||
|
||||
assert stdenvNoCC.hostPlatform.isLinux;
|
||||
|
||||
let
|
||||
common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation {
|
||||
name = "linux-headers-${version}";
|
||||
@ -13,7 +11,7 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
ARCH = stdenvNoCC.hostPlatform.platform.kernelArch;
|
||||
ARCH = stdenvNoCC.hostPlatform.platform.kernelArch or (throw "missing kernelArch");
|
||||
|
||||
# It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
|
||||
# We do this so we have a build->build, not build->host, C compiler.
|
||||
|
Loading…
Reference in New Issue
Block a user