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

GNU libc: Improve description and name for the Hurd; fix `needsPorts'. 

svn path=/nixpkgs/trunk/; revision=33833
This commit is contained in:
Ludovic Courtès 2012-04-18 17:22:04 +00:00
parent 46ec48923b
commit f59b9490ec
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/glibc/2.13/common.nix
View File

@ -16,7 +16,8 @@ let
needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsNative = stdenv.isMips || stdenv.isArm;
needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
needsPorts = if (stdenv ? cross) && stdenv.cross != null then true needsPorts =
if (stdenv ? cross) && stdenv.cross != null && hurdHeaders == null then true
else if cross == null then needsPortsNative else if cross == null then needsPortsNative
else needsPortsCross; else needsPortsCross;
@ -181,7 +182,8 @@ stdenv.mkDerivation ({
meta = { meta = {
homepage = http://www.gnu.org/software/libc/; homepage = http://www.gnu.org/software/libc/;
description = "The GNU C Library"; description = "The GNU C Library"
+ stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd";
longDescription = longDescription =
'' Any Unix-like operating system needs a C library: the library which '' Any Unix-like operating system needs a C library: the library which

4
pkgs/development/libraries/glibc/2.13/default.nix
View File

@ -14,7 +14,9 @@ let
cross = if gccCross != null then gccCross.target else null; cross = if gccCross != null then gccCross.target else null;
in in
build cross ({ build cross ({
name = "glibc${if debugSymbols then "-debug" else ""}"; name = "glibc"
+ stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
+ stdenv.lib.optionalString debugSymbols "-debug";
inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
gccCross; gccCross;