summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-05-10 11:13:45 +0300
committerEfraim Flashner <efraim@flashner.co.il>2022-05-10 11:13:45 +0300
commitd775a24344d4a910f6a19072c595bdafcf104b6f (patch)
treea715341a7bf9f756a7523b92a8a157f4a46ce9a3
parent37e44d48baf976f6bfcd885b2e10da4ab7be4af9 (diff)
downloadguix-patches-d775a24344d4a910f6a19072c595bdafcf104b6f.tar
guix-patches-d775a24344d4a910f6a19072c595bdafcf104b6f.tar.gz
gnu: openjdk12: Fix build.
* gnu/packages/java.scm (openjdk12)[arguments]: Override inherited 'fix-java-shebangs phase.
-rw-r--r--gnu/packages/java.scm12
1 files changed, 11 insertions, 1 deletions
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)