diff options
| author | Marius Bakke <marius@gnu.org> | 2022-11-26 17:37:10 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-12-02 19:08:27 +0100 |
| commit | 8737ee0479ac6ec100ba06902a83f506707be4e7 (patch) | |
| tree | 1f945adff6cb31c7c8bccbc65cf9f62084abd0a6 | |
| parent | 2cf835ae286d9f84ad9ccdcb38dc2b4c75dc2f74 (diff) | |
| download | guix-8737ee0479ac6ec100ba06902a83f506707be4e7.tar.gz guix-8737ee0479ac6ec100ba06902a83f506707be4e7.zip | |
gnu: wxWidgets: Remove input labels.
* gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE.
(wxwidgets-gtk2)[inputs]: Use MODIFY-INPUTS.
| -rw-r--r-- | gnu/packages/wxwidgets.scm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 4d2fd73cee..f92ac64b54 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -67,19 +67,19 @@ (base32 "01y89999jw5q7njrhxajincx7lydls6yq37ikazjryssrxrnw3s4")))) (build-system glib-or-gtk-build-system) (inputs - `(("glu" ,glu) - ;; XXX gstreamer-0.10 builds fail - ;; ("gstreamer" ,gstreamer-0.10) - ("gtk" ,gtk+) - ("libjpeg" ,libjpeg-turbo) - ("libmspack" ,libmspack) - ("libsm" ,libsm) - ("libtiff" ,libtiff) - ("mesa" ,mesa) - ("webkitgtk" ,webkitgtk) - ("sdl" ,sdl) - ("shared-mime-info" ,shared-mime-info) - ("xdg-utils" ,xdg-utils))) + (list glu + ;; XXX gstreamer-0.10 builds fail + ;; ("gstreamer" ,gstreamer-0.10) + gtk+ + libjpeg-turbo + libmspack + libsm + libtiff + mesa + webkitgtk + sdl + shared-mime-info + xdg-utils)) (native-inputs (list pkg-config)) (arguments @@ -102,10 +102,11 @@ (modify-phases %standard-phases (add-after 'unpack 'refer-to-inputs (lambda* (#:key inputs #:allow-other-keys) - (let* ((mime (search-input-directory inputs "/share/mime"))) + (let ((mime (search-input-directory inputs "share/mime")) + (xdg-open (search-input-file inputs "bin/xdg-open"))) (substitute* "src/unix/utilsx11.cpp" (("wxExecute\\(xdg_open \\+") - (string-append "wxExecute(\"" (which "xdg-open") "\""))) + (string-append "wxExecute(\"" xdg-open "\""))) (substitute* "src/unix/mimetype.cpp" (("/usr(/local)?/share/mime") mime)) #t)))))) @@ -154,11 +155,10 @@ and many other languages.") (define-public wxwidgets-gtk2 (package/inherit wxwidgets - (inputs `(("gtk+" ,gtk+-2) - ,@(alist-delete - "gtk+" - (package-inputs wxwidgets)))) - (name "wxwidgets-gtk2"))) + (name "wxwidgets-gtk2") + (inputs (modify-inputs (package-inputs wxwidgets) + (delete "gtk+") + (prepend gtk+-2))))) ;; Development version of wxWidgets, required to build against gstreamer-1.x. ;; This can be removed when wxWidgets is updated to the next stable version. |