mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
gnu: wxWidgets: Remove input labels.
* gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Remove labels. [arguments]: Use SEARCH-INPUT-FILE. (wxwidgets-gtk2)[inputs]: Use MODIFY-INPUTS.
This commit is contained in:
parent
2cf835ae28
commit
8737ee0479
1 changed files with 20 additions and 20 deletions
|
@ -67,19 +67,19 @@ (define-public wxwidgets
|
|||
(base32 "01y89999jw5q7njrhxajincx7lydls6yq37ikazjryssrxrnw3s4"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(inputs
|
||||
`(("glu" ,glu)
|
||||
(list 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)))
|
||||
gtk+
|
||||
libjpeg-turbo
|
||||
libmspack
|
||||
libsm
|
||||
libtiff
|
||||
mesa
|
||||
webkitgtk
|
||||
sdl
|
||||
shared-mime-info
|
||||
xdg-utils))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(arguments
|
||||
|
@ -102,10 +102,11 @@ (define-public wxwidgets
|
|||
(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 @@ (define-public wxwidgets-2
|
|||
|
||||
(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.
|
||||
|
|
Loading…
Reference in a new issue