From 7b4a5b8861de9f8f940d8bf60e225fcafbbb2b1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 10 Mar 2015 17:03:44 +0100 Subject: [PATCH 4/5] gnu: icedtea6: rename build phase `set-paths' * gnu/packages/java.scm (icedtea6)[arguments]: Avoid overriding standard `set-paths' phase by renaming new phase to `set-additional-paths'. --- gnu/packages/java.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 19be969..f0e9e51 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -369,12 +369,11 @@ build process and its dependencies, whereas Make uses Makefile format.") (("RO=ROL;2005-06-30-21-00-00;RON") "RO=RON") (("TR=TRL;2004-12-31-22-00-00;TRY") "TR=TRY")))) (alist-cons-before - 'configure 'set-paths + 'configure 'set-additional-paths (lambda* (#:key inputs #:allow-other-keys) (let* ((gcjdir (assoc-ref %build-inputs "gcj")) (gcjlib (string-append gcjdir "/lib")) (antpath (string-append (getcwd) "/../apache-ant-1.9.4"))) - (setenv "CC" (which "gcc")) (setenv "CPATH" (string-append (assoc-ref %build-inputs "libxrender") "/include/X11/extensions" ":" @@ -392,8 +391,6 @@ build process and its dependencies, whereas Make uses Makefile format.") (setenv "ALT_FREETYPE_LIB_PATH" (string-append (assoc-ref %build-inputs "freetype") "/lib")) - (setenv "LD_LIBRARY_PATH" - (string-append antpath "/lib" ":" gcjlib)) (setenv "PATH" (string-append antpath "/bin:" (getenv "PATH"))))) (alist-cons-before -- 2.1.0