public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glibc, kernel-headers: Fix some eval errors on Darwin

Browse Source 
Need to get the source to get elf.h
This commit is contained in:
John Ericson 2018-09-11 13:27:13 -04:00
parent d7e3dbef66
commit 846b44b2e9
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glibc/default.nix
View File

@ -5,8 +5,6 @@
, withGd ? false , withGd ? false
}: }:
assert stdenv.cc.isGNU;
callPackage ./common.nix { inherit stdenv; } { callPackage ./common.nix { inherit stdenv; } {
name = "glibc" + stdenv.lib.optionalString withGd "-gd"; name = "glibc" + stdenv.lib.optionalString withGd "-gd";
@ -96,7 +94,8 @@ callPackage ./common.nix { inherit stdenv; } {
mv $bin/bin/getconf_ $bin/bin/getconf mv $bin/bin/getconf_ $bin/bin/getconf
''; '';
separateDebugInfo = true; # Hack to get around eval issue.
separateDebugInfo = !stdenv.isDarwin;
meta.description = "The GNU C Library"; meta.description = "The GNU C Library";
} }

4
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -2,8 +2,6 @@
, fetchurl, perl , fetchurl, perl
}: }:
assert stdenvNoCC.hostPlatform.isLinux;
let let
common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation { common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation {
name = "linux-headers-${version}"; name = "linux-headers-${version}";
@ -13,7 +11,7 @@ let
inherit sha256; 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. # 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. # We do this so we have a build->build, not build->host, C compiler.