From 5968b490d66e2a6d0e1f06fd7d7c9492decc98f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Jan 2010 23:28:58 +0000 Subject: [PATCH] The fix in r19516 made evident an error in the gnatboot expression, about library paths. Fixing this, to get gnat properly built. svn path=/nixpkgs/branches/stdenv-updates/; revision=19531 --- pkgs/development/compilers/gnatboot/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 1637cf5f927..954fb6bf594 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -19,12 +19,10 @@ stdenv.mkDerivation { installPhase = '' ensureDir $out cp -R * $out - cd $out/bin set +e - for a in *; do + for a in $out/bin/* ; do patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) \ - --set-rpath $(cat $NIX_GCC/nix-support/orig-libc)/lib:$(cat - $NIX_GCC/nix-support/orig-gcc) $a + --set-rpath $(cat $NIX_GCC/nix-support/orig-libc)/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib $a done set -e mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc