mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 15:22:59 +01:00
glibc: Make the native store path independent on whether `gccCross' is null.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23283
This commit is contained in:
parent
87a62c6369
commit
9b9df7a444
1 changed files with 3 additions and 3 deletions
|
@ -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}" +
|
||||
|
|
Loading…
Reference in a new issue