diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-11 13:27:13 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-15 01:07:06 -0400 |
commit | 846b44b2e958cd38c02f70847736598ce7e4c7a0 (patch) | |
tree | 25958dfccc649fb8c430b063696d5f849b8d02ed /pkgs | |
parent | d7e3dbef6603b398c6b4b3c248b1b1d3bd8949fb (diff) | |
download | nixpkgs-846b44b2e958cd38c02f70847736598ce7e4c7a0.tar nixpkgs-846b44b2e958cd38c02f70847736598ce7e4c7a0.tar.gz nixpkgs-846b44b2e958cd38c02f70847736598ce7e4c7a0.tar.bz2 nixpkgs-846b44b2e958cd38c02f70847736598ce7e4c7a0.tar.lz nixpkgs-846b44b2e958cd38c02f70847736598ce7e4c7a0.tar.xz nixpkgs-846b44b2e958cd38c02f70847736598ce7e4c7a0.tar.zst nixpkgs-846b44b2e958cd38c02f70847736598ce7e4c7a0.zip |
glibc, kernel-headers: Fix some eval errors on Darwin
Need to get the source to get elf.h
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 5 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/default.nix | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index ea443ce9a24..c74c27598ee 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -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"; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index e82b785f624..09fa4fbfd3a 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -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. |