fix "libc}/lib" and similar references

Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
This commit is contained in:
Vladimír Čunát
2015-05-05 11:52:08 +02:00
parent b7c3c25218
commit 3b9ef2c71b
81 changed files with 156 additions and 156 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
# This package requires a locale ru_RU.cp1251 locale entry.
# Waiting for a better idea, I created it modifying a store file using:
# localedef -f CP1251 -i ru_RU ru_RU.CP1251
# The store file mentioned is in "${glibc}/lib/locale/locale-archive"
# The store file mentioned is in "${glibc.out}/lib/locale/locale-archive"
stdenv.mkDerivation {
name = "multitran-data-0.3";
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/bin"
cp -a usr/* "$out/"
interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)"
interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)"
patchelf --set-interpreter "$interpreter" "$out/bin/xidel"
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel"
'';