diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2017-10-17 16:45:28 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-10-17 16:49:20 +0200 |
| commit | 8843373322b2d1a95175c578659fb1521461ef6a (patch) | |
| tree | 3bfbce3c8e06bc74363853814136d11f9e286ce7 /gnu/packages/version-control.scm | |
| parent | c56c5e78eac14e5d56b1b71e572d2cb41f8c812f (diff) | |
| download | guix-8843373322b2d1a95175c578659fb1521461ef6a.tar guix-8843373322b2d1a95175c578659fb1521461ef6a.tar.gz | |
gnu: java-jgit: Include properties files.
* gnu/packages/version-control.scm (java-jgit)[arguments]: Add phase
"add-properties".
(java-jgit-4.2)[arguments]: Move modification of phases into
substitute-keyword-arguments clause.
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 38756f06c2..7c9b049849 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1650,7 +1650,17 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. ;; JGit must be built with a JDK supporting Java 8. #:jdk ,icedtea-8 ;; Target our older default JDK. - #:make-flags (list "-Dtarget=1.7"))) + #:make-flags (list "-Dtarget=1.7") + #:phases + (modify-phases %standard-phases + ;; The jar file generated by the default build.xml does not include + ;; the text properties files, so we need to add them. + (add-after 'build 'add-properties + (lambda* (#:key jar-name #:allow-other-keys) + (with-directory-excursion "src" + (zero? (apply system* "jar" "-uf" + (string-append "../build/jar/" jar-name) + (find-files "." "\\.properties$"))))))))) (inputs `(("java-classpathx-servletapi" ,java-classpathx-servletapi) ("java-javaewah" ,java-javaewah) @@ -1679,16 +1689,16 @@ network protocols, and core version control algorithms.") "15gm537iivhnzlkjym4x3wn5jqdjdragsw9pdpzqqg21nrc817mm")))) (build-system ant-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-latest-javaewah-API - (lambda _ - (substitute* "src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java" - (("wordinbits") "WORD_IN_BITS")) - #t))) + (substitute-keyword-arguments (package-arguments java-jgit) ;; Build for default JDK. - ,@(substitute-keyword-arguments (package-arguments java-jgit) - ((#:jdk _) icedtea-7)))) + ((#:jdk _) icedtea-7) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'use-latest-javaewah-API + (lambda _ + (substitute* "src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java" + (("wordinbits") "WORD_IN_BITS")) + #t)))))) (inputs `(("java-javaewah" ,java-javaewah) ("java-jsch" ,java-jsch) |