fix goldendict-ng

the previous patch for goldendict-ng couldn't get rid of the wrapper, it still relies heavily on environment variables to find other components
This commit is contained in:
千住柱間 2024-11-05 21:42:04 -04:00
parent 62de66de84
commit 06f11bf2fc
Signed by: hashirama
GPG key ID: 53E62470A86BC185

View file

@ -71,11 +71,24 @@
#~(list "-DCMAKE_BUILD_TYPE=Release" #~(list "-DCMAKE_BUILD_TYPE=Release"
(string-append "PKG_CONFIG_PATH=" (string-append "PKG_CONFIG_PATH="
#$(this-package-input "qtbase") #$(this-package-input "qtbase")
"/include/qt6/QtPrintSupport")))) "/include/qt6/QtPrintSupport"))
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'wrap-qt-process-path
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/goldendict")
`("QTWEBENGINE_RESOURCES_PATH" =
(,(search-input-directory
inputs "/share/qt6/resources")))
`("QTWEBENGINEPROCESS_PATH" =
(,(search-input-file
inputs "/lib/qt6/libexec/QtWebEngineProcess")))))))))
(native-inputs (native-inputs
(list hunspell (list hunspell
icu4c icu4c
libeb libeb
qtwebengine
qtsvg
libtiff libtiff
libvorbis libvorbis
libxkbcommon libxkbcommon
@ -105,18 +118,10 @@
qtmultimedia qtmultimedia
gstreamer gstreamer
qtbase qtbase
qtsvg
xproto)) xproto))
(propagated-inputs (propagated-inputs
(list qtwebengine)) (list qtsvg))
(search-paths
(list (search-path-specification
(variable "QTWEBENGINE_RESOURCES_PATH")
(files (list "share/qt6/resources")))
(search-path-specification
(variable "QTWEBENGINEPROCESS_PATH")
(file-type 'regular)
(separator " ")
(files (list "lib/qt6/libexec/QtWebEngineProcess")))))
(synopsis "A feature-rich dictionary lookup program") (synopsis "A feature-rich dictionary lookup program")
(description (description
"GoldenDict is a feature-rich dictionary lookup program, "GoldenDict is a feature-rich dictionary lookup program,