From ca88cf2ac9f0b2ae3a7eda7e6d65987843ea03a3 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Wed, 23 Apr 2014 00:51:27 +0200 Subject: glibc_multi: fix ldd on x86_64 --- pkgs/top-level/all-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 579e8d741d9f..5b9b77484d83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4445,6 +4445,15 @@ let ln -s $glibc32/lib $out/lib/32 ln -s lib $out/lib64 + # fixing ldd RLTLIST + rm $out/bin + cp -rs $glibc64/bin $out + chmod u+w $out/bin + rm $out/bin/ldd + sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \ + $glibc64/bin/ldd > $out/bin/ldd + chmod 555 $out/bin/ldd + rm $out/include cp -rs $glibc32/include $out chmod -R u+w $out/include -- cgit v1.2.3 From e11a71c3be4b73b18703719616fe407430e08ce7 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 25 Apr 2014 11:49:09 +0200 Subject: glibc_multi: fix typo --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b9b77484d83..132e1d5849e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4445,7 +4445,7 @@ let ln -s $glibc32/lib $out/lib/32 ln -s lib $out/lib64 - # fixing ldd RLTLIST + # fixing ldd RLTDLIST rm $out/bin cp -rs $glibc64/bin $out chmod u+w $out/bin -- cgit v1.2.3