ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: wxWidgets: Remove input labels.

Browse source 
* gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE.
(wxwidgets-gtk2)[inputs]: Use MODIFY-INPUTS.
This commit is contained in:
Marius Bakke 2022-11-26 17:37:10 +01:00
parent 2cf835ae28
commit 8737ee0479
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/wxwidgets.scm
View file

@ -67,19 +67,19 @@ (define-public wxwidgets
(base32 "01y89999jw5q7njrhxajincx7lydls6yq37ikazjryssrxrnw3s4")))) (base32 "01y89999jw5q7njrhxajincx7lydls6yq37ikazjryssrxrnw3s4"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(inputs (inputs
`(("glu" ,glu) (list glu
;; XXX gstreamer-0.10 builds fail ;; XXX gstreamer-0.10 builds fail
;; ("gstreamer" ,gstreamer-0.10) ;; ("gstreamer" ,gstreamer-0.10)
("gtk" ,gtk+) gtk+
("libjpeg" ,libjpeg-turbo) libjpeg-turbo
("libmspack" ,libmspack) libmspack
("libsm" ,libsm) libsm
("libtiff" ,libtiff) libtiff
("mesa" ,mesa) mesa
("webkitgtk" ,webkitgtk) webkitgtk
("sdl" ,sdl) sdl
("shared-mime-info" ,shared-mime-info) shared-mime-info
("xdg-utils" ,xdg-utils))) xdg-utils))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(arguments (arguments
@ -102,10 +102,11 @@ (define-public wxwidgets
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'refer-to-inputs (add-after 'unpack 'refer-to-inputs
(lambda* (#:key inputs #:allow-other-keys) (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" (substitute* "src/unix/utilsx11.cpp"
(("wxExecute\\(xdg_open \\+") (("wxExecute\\(xdg_open \\+")
(string-append "wxExecute(\"" (which "xdg-open") "\""))) (string-append "wxExecute(\"" xdg-open "\"")))
(substitute* "src/unix/mimetype.cpp" (substitute* "src/unix/mimetype.cpp"
(("/usr(/local)?/share/mime") mime)) (("/usr(/local)?/share/mime") mime))
#t)))))) #t))))))
@ -154,11 +155,10 @@ (define-public wxwidgets-2
(define-public wxwidgets-gtk2 (define-public wxwidgets-gtk2
(package/inherit wxwidgets (package/inherit wxwidgets
(inputs `(("gtk+" ,gtk+-2) (name "wxwidgets-gtk2")
,@(alist-delete (inputs (modify-inputs (package-inputs wxwidgets)
"gtk+" (delete "gtk+")
(package-inputs wxwidgets)))) (prepend gtk+-2)))))
(name "wxwidgets-gtk2")))
;; Development version of wxWidgets, required to build against gstreamer-1.x. ;; Development version of wxWidgets, required to build against gstreamer-1.x.
;; This can be removed when wxWidgets is updated to the next stable version. ;; This can be removed when wxWidgets is updated to the next stable version.