mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-16 10:43:27 +00:00
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
diff -ru origsource/tabula/io.py source/tabula/io.py
|
|
--- origsource/tabula/io.py 2022-11-23 17:19:35.419837514 +0100
|
|
+++ source/tabula/io.py 2022-11-23 17:22:08.204194807 +0100
|
|
@@ -79,7 +79,7 @@
|
|
)
|
|
)
|
|
|
|
- args = ["java"] + java_options + ["-jar", _jar_path()] + options.build_option_list()
|
|
+ args = ["@JAVA@"] + java_options + ["-jar", _jar_path()] + options.build_option_list()
|
|
if path:
|
|
args.append(path)
|
|
|
|
diff -ru origsource/tabula/util.py source/tabula/util.py
|
|
--- origsource/tabula/util.py 2022-11-23 17:19:35.422837521 +0100
|
|
+++ source/tabula/util.py 2022-11-23 17:21:41.514132392 +0100
|
|
@@ -26,7 +26,7 @@
|
|
|
|
try:
|
|
res = subprocess.check_output(
|
|
- ["java", "-version"], stderr=subprocess.STDOUT
|
|
+ ["@JAVA@", "-version"], stderr=subprocess.STDOUT
|
|
).decode()
|
|
|
|
except FileNotFoundError:
|
|
diff -ru origsource/tests/test_read_pdf_table.py source/tests/test_read_pdf_table.py
|
|
--- origsource/tests/test_read_pdf_table.py 2022-11-23 17:19:35.422837521 +0100
|
|
+++ source/tests/test_read_pdf_table.py 2022-11-23 17:21:22.008086776 +0100
|
|
@@ -281,7 +281,7 @@
|
|
|
|
tabula.read_pdf(self.pdf_path, encoding="utf-8")
|
|
|
|
- target_args = ["java"]
|
|
+ target_args = ["@JAVA@"]
|
|
if platform.system() == "Darwin":
|
|
target_args += ["-Djava.awt.headless=true"]
|
|
target_args += [
|
|
@@ -355,7 +355,7 @@
|
|
|
|
tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=False)
|
|
|
|
- target_args = ["java"]
|
|
+ target_args = ["@JAVA@"]
|
|
if platform.system() == "Darwin":
|
|
target_args += ["-Djava.awt.headless=true"]
|
|
target_args += [
|
|
@@ -382,7 +382,7 @@
|
|
|
|
tabula.read_pdf(self.pdf_path, encoding="utf-8", silent=True)
|
|
|
|
- target_args = ["java"]
|
|
+ target_args = ["@JAVA@"]
|
|
if platform.system() == "Darwin":
|
|
target_args += ["-Djava.awt.headless=true"]
|
|
target_args += [
|