Author: ludo
Date: Wed Apr 18 17:22:04 2012
New Revision: 33833
URL: https://nixos.org/websvn/nix/?rev=33833&sc=1
Log:
GNU libc: Improve description and name for the Hurd; fix `needsPorts'.
Modified:
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Wed Apr
18 16:08:25 2012 (r33832)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/common.nix Wed Apr
18 17:22:04 2012 (r33833)
@@ -16,7 +16,8 @@
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 @@
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
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/default.nix Wed Apr
18 16:08:25 2012 (r33832)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc/2.13/default.nix Wed Apr
18 17:22:04 2012 (r33833)
@@ -14,7 +14,9 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
