diff --git a/zilti/packages/pharo.scm b/zilti/packages/pharo.scm index b38f791..31d434f 100644 --- a/zilti/packages/pharo.scm +++ b/zilti/packages/pharo.scm @@ -31,8 +31,6 @@ (list #:configure-flags #~(list - (string-append "-DPHARO_BIN_LOCATION=" - (assoc-ref %outputs "out") "/bin") (string-append "-DPHARO_LIBRARY_PATH=" (assoc-ref %outputs "out") "/lib") "-DGENERATED_SOURCE_DIR=." @@ -43,12 +41,11 @@ #:phases #~(modify-phases %standard-phases (delete 'check) + (delete 'validate-runpath) (add-after 'install 'really-install (lambda _ (let ((bin (string-append #$output "/bin")) (lib (string-append #$output "/lib"))) - (wrap-program "./build/vm/pharo" - `("LD_LIBRARY_PATH" prefix (,lib))) (mkdir-p bin) (mkdir-p lib) (copy-recursively "./build/vm/pharo" @@ -62,7 +59,9 @@ "./build/vm" (find-files "." (lambda (file stat) - (string-contains file ".so"))))))))))) + (string-contains file ".so"))))) + (wrap-program (string-append bin "/pharo") + `("LD_LIBRARY_PATH" prefix (,lib))))))))) (inputs (list libffi libgit2