nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Ricardo Wurmus 2015-03-10 13:56:55 +01:00
parent e73b49fbd6
commit f9e62ad221
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/java.scm
View File

@ -184,6 +184,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
(zero? (system* "tar" "xvjf" (zero? (system* "tar" "xvjf"
(assoc-ref inputs "ant-bootstrap"))) (assoc-ref inputs "ant-bootstrap")))
(begin (begin
(patch-shebang "apache-ant-1.9.4/bin/ant")
(chdir (string-append ,name "-" ,version)) (chdir (string-append ,name "-" ,version))
(mkdir "openjdk") (mkdir "openjdk")
(with-directory-excursion "openjdk" (with-directory-excursion "openjdk"
@ -193,8 +194,6 @@ build process and its dependencies, whereas Make uses Makefile format.")
(alist-cons-after (alist-cons-after
'unpack 'patch-paths 'unpack 'patch-paths
(lambda _ (lambda _
(patch-shebang "../apache-ant-1.9.4/bin/ant")
;; shebang in patches so that they apply cleanly ;; shebang in patches so that they apply cleanly
(substitute* '("patches/jtreg-jrunscript.patch" (substitute* '("patches/jtreg-jrunscript.patch"
"patches/hotspot/hs23/drop_unlicensed_test.patch") "patches/hotspot/hs23/drop_unlicensed_test.patch")