diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-06-30 09:20:22 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-06-30 09:20:22 +0400 |
| commit | d2d969f08a1a8d8b3177de9f426da2a8aaa2da94 (patch) | |
| tree | 9e33d4be08040f4cb23ed6ae2bf8e88229612a11 /pkgs | |
| parent | f2e9ebbd46e4026d760118701c6decf01b50f024 (diff) | |
| parent | e11a71c3be4b73b18703719616fe407430e08ce7 (diff) | |
Merge pull request #2354 from hrdinka/fix_glibc_multi
glibc_multi: fix ldd on x86_64
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfb4ac4ba823..0c5f32831038 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4625,6 +4625,15 @@ let ln -s $glibc32/lib $out/lib/32 ln -s lib $out/lib64 + # fixing ldd RLTDLIST + 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 |