[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: openjdk12: Fix build.
From: |
guix-commits |
Subject: |
branch master updated: gnu: openjdk12: Fix build. |
Date: |
Tue, 10 May 2022 04:21:44 -0400 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new d775a24344 gnu: openjdk12: Fix build.
d775a24344 is described below
commit d775a24344d4a910f6a19072c595bdafcf104b6f
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue May 10 11:13:45 2022 +0300
gnu: openjdk12: Fix build.
* gnu/packages/java.scm (openjdk12)[arguments]: Override inherited
'fix-java-shebangs phase.
---
gnu/packages/java.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 3d05ef831e..97eae386de 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
-;;; Copyright © 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2019, 2020, 2021, 2022 Efraim Flashner
<efraim@flashner.co.il>
;;; Copyright © 2019, 2020, 2021 Björn Höfling
<bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
@@ -2054,6 +2054,16 @@ new Date();"))
`(begin
(for-each delete-file (find-files "." ".*.(bin|exe|jar)$"))
#t))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments openjdk11)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'fix-java-shebangs
+ (lambda _
+ ;; This file was "fixed" by patch-source-shebangs, but it
requires
+ ;; this exact first line.
+ (substitute*
"make/data/blacklistedcertsconverter/blacklisted.certs.pem"
+ (("^#!.*") "#! java BlacklistedCertsConverter
SHA-256\n"))))))))
(inputs
`(("alsa-lib" ,alsa-lib)
("cups" ,cups)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: openjdk12: Fix build.,
guix-commits <=