From d7a4fa26b064aa294b1f52c61b02770feed6903b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Jun 2014 11:29:51 +0200 Subject: [PATCH] Fix dontPatchELF being set after the setup script has been sourced --- pkgs/development/tools/misc/patchelf/setup-hook.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh index e27d1ed5b00..6bc918a4610 100644 --- a/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -2,9 +2,7 @@ # directories from the RPATH of every library or executable in every # output. -if [ -z "$dontPatchELF" ]; then - addHook fixupOutput 'patchELF "$prefix"' -fi +addHook fixupOutput 'if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi' patchELF() { header "patching ELF executables and libraries in $prefix"