diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-17 18:00:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-12-02 00:21:25 +0100 |
| commit | 503fb0dcb4cab921b5e280f119725850e65abbc9 (patch) | |
| tree | b59271cf1a8339ef1ce616cc1f2dc4dc65ade211 | |
| parent | 1a8d063a44f93a47831e8e2680e82663dfbf9c10 (diff) | |
| download | guix-503fb0dcb4cab921b5e280f119725850e65abbc9.tar guix-503fb0dcb4cab921b5e280f119725850e65abbc9.tar.gz | |
gnu: ungoogled-chromium: Generalize OpenJPEG substitution.
* gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Don't hard code
openjpeg version.
| -rw-r--r-- | gnu/packages/chromium.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index e0a9f5fbad..37b74833e1 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -613,11 +613,12 @@ #~(modify-phases %standard-phases (add-after 'unpack 'patch-stuff (lambda* (#:key inputs #:allow-other-keys) - (let ((openjpeg (search-input-directory - inputs "include/openjpeg-2.4"))) + (let* ((libopenjp2 (search-input-file inputs "lib/libopenjp2.so")) + (openjpeg (dirname (dirname libopenjp2)))) (substitute* "third_party/pdfium/BUILD.gn" ;; This include path is added by Debians openjpeg patch. - (("/usr/include/openjpeg-2.4") openjpeg)) + (("/usr/include/openjpeg-") + (string-append openjpeg "/include/openjpeg-"))) ;; Adjust minizip header inclusions. (substitute* (find-files "third_party/tflite_support\ |