Author: ludo
Date: Fri Aug 20 15:26:56 2010
New Revision: 23283
URL: https://svn.nixos.org/websvn/nix/?rev=23283&sc=1
Log:
glibc: Make the native store path independent on whether `gccCross' is null.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
Fri Aug 20 15:26:50 2010 (r23282)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
Fri Aug 20 15:26:56 2010 (r23283)
@@ -108,9 +108,9 @@
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system ==
"i686-linux") "-U__i686";
}
-# FIXME: This is way too broad and causes the *native* glibc to have a
-# different store path dependending on whether `cross' is null or not.
-// args //
+# Remove the `gccCross' attribute so that the *native* glibc store path
+# doesn't depend on whether `gccCross' is null or not.
+// (removeAttrs args [ "gccCross" ]) //
{
name = name + "-${version}" +
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
