ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-07 03:44:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cambalache: Update to 0.10.3.

Browse source 
* gnu/packages/gnome.scm (cambalache): Update to 0.10.3 and fix indentation.
[phases]{patch-source}: Use format to double-quote string.
This commit is contained in:
Maxim Cournoyer 2022-09-08 22:07:15 -04:00
parent 00ca5ce621
commit ccbbe12721
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 87 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/gnome.scm
View file

@ -3286,7 +3286,7 @@ (define-public blueprint-compiler
(define-public cambalache (define-public cambalache
(package (package
(name "cambalache") (name "cambalache")
(version "0.10.2") (version "0.10.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3294,7 +3294,7 @@ (define-public cambalache
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1mw5gk98zx03yal3p8slaqwhwkc9p2vnh0cssnmg6ivxsjscqhgz")))) (base32 "1nq9bvly4dm1xnh90z3b4c5455qpdgm3jgz2155vg2ai23f22vsy"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
@ -3310,10 +3310,8 @@ (define-public cambalache
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "cambalache/cmb_view.py" (substitute* "cambalache/cmb_view.py"
(("GLib\\.find_program_in_path\\('(.*)'\\)" all cmd) (("GLib\\.find_program_in_path\\('(.*)'\\)" all cmd)
(string-append "'" (format #f "~s" (search-input-file
(search-input-file inputs inputs (string-append "bin/" cmd)))))))
(string-append "/bin/" cmd))
"'")))))
(add-after 'unpack 'patch-build (add-after 'unpack 'patch-build
(lambda _ (lambda _
(substitute* "postinstall.py" (substitute* "postinstall.py"
@ -3332,14 +3330,13 @@ (define-public cambalache
(with-directory-excursion ".." (with-directory-excursion ".."
(invoke "python3" "-m" "pytest"))))) (invoke "python3" "-m" "pytest")))))
(add-after 'glib-or-gtk-wrap 'wrap-typelib (add-after 'glib-or-gtk-wrap 'wrap-typelib
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out")))
(for-each (for-each
(lambda (prog) (lambda (prog)
(unless (wrapped-program? prog) (unless (wrapped-program? prog)
(wrap-program prog (wrap-program prog
`("GI_TYPELIB_PATH" suffix `("GI_TYPELIB_PATH" suffix
(,(string-append out "/lib/girepository-1.0") (,(string-append #$output "/lib/girepository-1.0")
,(getenv "GI_TYPELIB_PATH"))) ,(getenv "GI_TYPELIB_PATH")))
;; icons and schemas ;; icons and schemas
`("XDG_DATA_DIRS" suffix `("XDG_DATA_DIRS" suffix
@ -3352,8 +3349,9 @@ (define-public cambalache
;; load its own icons in pure environments. ;; load its own icons in pure environments.
`("GDK_PIXBUF_MODULE_FILE" = `("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE")))))) (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))
(find-files (string-append out "/bin"))))))))) (find-files (string-append #$output "/bin"))))))))
(inputs (list bash-minimal (inputs
(list bash-minimal
adwaita-icon-theme hicolor-icon-theme adwaita-icon-theme hicolor-icon-theme
gsettings-desktop-schemas gsettings-desktop-schemas
gtk gtk
@ -3362,7 +3360,9 @@ (define-public cambalache
libadwaita libadwaita
libhandy libhandy
(librsvg-for-system) (librsvg-for-system)
python python-pygobject python-lxml python
python-pygobject
python-lxml
webkitgtk-with-libsoup2)) webkitgtk-with-libsoup2))
(native-inputs (list `(,glib "bin") gobject-introspection (native-inputs (list `(,glib "bin") gobject-introspection
gettext-minimal pkg-config gettext-minimal pkg-config