diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-04-18 17:22:04 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-04-18 17:22:04 +0000 |
| commit | f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27 (patch) | |
| tree | 08f0e7080c58471afb8d782300c458ed24812f8f /pkgs/development/libraries/glibc | |
| parent | 46ec48923b425a00a8c26ec2d04c9e08e13dcddb (diff) | |
| download | nixlib-f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27.tar nixlib-f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27.tar.gz nixlib-f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27.tar.bz2 nixlib-f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27.tar.lz nixlib-f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27.tar.xz nixlib-f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27.tar.zst nixlib-f59b9490ecb20c4d76af9d3a9ad1b46fcd2b9d27.zip | |
GNU libc: Improve description and name for the Hurd; fix `needsPorts'.
svn path=/nixpkgs/trunk/; revision=33833
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.13/common.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/2.13/default.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 840c60545524..ca5be5998aaf 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -16,7 +16,8 @@ let needsPortsNative = stdenv.isMips || stdenv.isArm; 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 needsPortsCross; @@ -181,7 +182,8 @@ stdenv.mkDerivation ({ meta = { 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 = '' Any Unix-like operating system needs a C library: the library which diff --git a/pkgs/development/libraries/glibc/2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix index 1b4e43b1013a..f80ed9372e63 100644 --- a/pkgs/development/libraries/glibc/2.13/default.nix +++ b/pkgs/development/libraries/glibc/2.13/default.nix @@ -14,7 +14,9 @@ let cross = if gccCross != null then gccCross.target else null; in 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 gccCross; |