From fe32d12ef7704b9b797948c1fe5fbd10e5b59257 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Sun, 24 Nov 2013 21:05:59 +0100 Subject: glibc-locales: don't depend on /nix/store location previously, $TMPDIR/nix/store is hard-coded so that only building and installing is correct with /nix/store See #1273. --- pkgs/development/libraries/glibc/2.17/locales.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/glibc/2.17') diff --git a/pkgs/development/libraries/glibc/2.17/locales.nix b/pkgs/development/libraries/glibc/2.17/locales.nix index b7eae50ca385..680a1ced3dee 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/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale/locale-archive" "$out/lib/locale" ''; meta.description = "Locale information for the GNU C Library"; -- cgit 1.4.1 From 8c1a49bf7a072e7686fb8f2b0baa8a73888ee7fb Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 27 Nov 2013 21:32:42 +0100 Subject: glibcLocales: refactoring fe32d12 according to comments --- pkgs/development/libraries/glibc/2.17/locales.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/glibc/2.17') diff --git a/pkgs/development/libraries/glibc/2.17/locales.nix b/pkgs/development/libraries/glibc/2.17/locales.nix index 680a1ced3dee..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/"$(dirname $(readlink -f $(type -p localedef)))/../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"; -- cgit 1.4.1