diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-08-20 15:26:56 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-08-20 15:26:56 +0000 |
| commit | 9b9df7a44498610cf5a59b9761f5e7b977872c20 (patch) | |
| tree | 62a904c06c0b62ffa9a867587c3cc8318b2daa79 /pkgs/development/libraries/glibc-2.12 | |
| parent | 87a62c6369afe04beb2c59a8d57471f71946d30c (diff) | |
| download | nixpkgs-9b9df7a44498610cf5a59b9761f5e7b977872c20.tar nixpkgs-9b9df7a44498610cf5a59b9761f5e7b977872c20.tar.gz nixpkgs-9b9df7a44498610cf5a59b9761f5e7b977872c20.tar.bz2 nixpkgs-9b9df7a44498610cf5a59b9761f5e7b977872c20.tar.lz nixpkgs-9b9df7a44498610cf5a59b9761f5e7b977872c20.tar.xz nixpkgs-9b9df7a44498610cf5a59b9761f5e7b977872c20.tar.zst nixpkgs-9b9df7a44498610cf5a59b9761f5e7b977872c20.zip | |
glibc: Make the native store path independent on whether `gccCross' is null.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23283
Diffstat (limited to 'pkgs/development/libraries/glibc-2.12')
| -rw-r--r-- | pkgs/development/libraries/glibc-2.12/common.nix | 6 |
1 files 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}" + |