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

glibc: Make the native store path independent on whether `gccCross' is null.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23283
This commit is contained in:
Ludovic Courtès 2010-08-20 15:26:56 +00:00
parent 87a62c6369
commit 9b9df7a444
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/glibc-2.12/common.nix
View File

@ -108,9 +108,9 @@ stdenv.mkDerivation ({
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; 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 # Remove the `gccCross' attribute so that the *native* glibc store path
# different store path dependending on whether `cross' is null or not. # doesn't depend on whether `gccCross' is null or not.
// args // // (removeAttrs args [ "gccCross" ]) //
{ {
name = name + "-${version}" + name = name + "-${version}" +