diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
| commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
| tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/development/libraries/glibc/2.17 | |
| parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
| parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) | |
| download | nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.gz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.bz2 nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.lz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.xz nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.tar.zst nixlib-c32bf83301bc4063df924ee442d8e35c1b96d912.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/development/libraries/glibc/2.17')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.17/locales.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/2.17/locales.nix b/pkgs/development/libraries/glibc/2.17/locales.nix index b7eae50ca385..e818b84bc628 100644 --- a/pkgs/development/libraries/glibc/2.17/locales.nix +++ b/pkgs/development/libraries/glibc/2.17/locales.nix @@ -40,7 +40,7 @@ in installPhase = '' mkdir -p "$out/lib/locale" - cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" + cp -v "$TMPDIR/$NIX_STORE/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; meta.description = "Locale information for the GNU C Library"; |