aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2024-02-23 23:23:52 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2024-02-24 00:01:46 +0100
commitf93d86aaaf0eb0a85a3761e9303418319c67a470 (patch)
tree78715f79f17d7daeee27025bfd4dc873295f5e54 /gnu
parentb993bfa94fe8dad320a51b26db3a7c1760535aba (diff)
downloadguix-f93d86aaaf0eb0a85a3761e9303418319c67a470.tar.gz
guix-f93d86aaaf0eb0a85a3761e9303418319c67a470.zip
gnu: openjdk11: Fix ".so" file path patching.
* gnu/packages/java.scm (openjdk11)[arguments]<#:phases>[patch-jni-libs]: Fix ".so" file path patching. Change-Id: If705ef237a2afe537af41227479cd2f91efe5ae2
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/java.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 00768388dc..6be97eabbc 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1298,10 +1298,10 @@ new Date();"))
(catch 'decoding-error
(lambda ()
(substitute* file
- (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)"
+ (("VERSIONED_JNI_LIB_NAME\\(\"([^\"]*)\", \"([^\"]*)\"\\)"
_ name version)
(string-append "\"" (find-library name) "\""))
- (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name)
+ (("JNI_LIB_NAME\\(\"([^\"]*)\"\\)" _ name)
(string-append "\"" (find-library name) "\""))))
(lambda _
;; Those are safe to skip.