From 3bc3dd46ebec97acf424bbc8b3026ee23fdafa19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 10 Mar 2015 13:56:55 +0100 Subject: [PATCH 1/5] gnu: icedtea6: patch ant shebang in unpack phase * gnu/packages/java.scm (icedtea6)[arguments]: patch bootstrap ant in the `unpack' phase instead of `patch-paths'. --- gnu/packages/java.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 70a1830..38eee0e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -267,6 +267,7 @@ build process and its dependencies, whereas Make uses Makefile format.") (zero? (system* "tar" "xvjf" (assoc-ref inputs "ant-bootstrap"))) (begin + (patch-shebang "apache-ant-1.9.4/bin/ant") (chdir (string-append ,name "-" ,version)) (mkdir "openjdk") (with-directory-excursion "openjdk" @@ -276,8 +277,6 @@ build process and its dependencies, whereas Make uses Makefile format.") (alist-cons-after 'unpack 'patch-paths (lambda _ - (patch-shebang "../apache-ant-1.9.4/bin/ant") - ;; shebang in patches so that they apply cleanly (substitute* '("patches/jtreg-jrunscript.patch" "patches/hotspot/hs23/drop_unlicensed_test.patch") -- 2.1.0