[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: openjdk11: Fix ".so" file path patching.
From: |
guix-commits |
Subject: |
01/02: gnu: openjdk11: Fix ".so" file path patching. |
Date: |
Fri, 23 Feb 2024 18:07:54 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit f93d86aaaf0eb0a85a3761e9303418319c67a470
Author: Danny Milosavljevic <dannym@scratchpost.org>
AuthorDate: Fri Feb 23 23:23:52 2024 +0100
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
---
gnu/packages/java.scm | 4 ++--
1 file 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.