From 9b9df7a44498610cf5a59b9761f5e7b977872c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 20 Aug 2010 15:26:56 +0000 Subject: [PATCH] glibc: Make the native store path independent on whether `gccCross' is null. svn path=/nixpkgs/branches/stdenv-updates/; revision=23283 --- pkgs/development/libraries/glibc-2.12/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index d35062f0957..84578dc103c 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.12/common.nix @@ -108,9 +108,9 @@ stdenv.mkDerivation ({ 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}" +