ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-05 10:56:56 -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

174
gnu/packages/gnome.scm
View file

@ -3285,95 +3285,95 @@ (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
(url "https://gitlab.gnome.org/jpu/cambalache") (url "https://gitlab.gnome.org/jpu/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
#:glib-or-gtk? #t #:glib-or-gtk? #t
#:imported-modules `((guix build python-build-system) #:imported-modules `((guix build python-build-system)
,@%meson-build-system-modules) ,@%meson-build-system-modules)
#:modules '((guix build meson-build-system) #:modules '((guix build meson-build-system)
((guix build python-build-system) #:prefix python:) ((guix build python-build-system) #:prefix python:)
(guix build utils)) (guix build utils))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
(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
"'"))))) (lambda _
(add-after 'unpack 'patch-build (substitute* "postinstall.py"
(lambda _ (("update-desktop-database") "true"))))
(substitute* "postinstall.py" (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap))
(("update-desktop-database") "true")))) (delete 'check)
(add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap)) (add-after 'install 'add-install-to-pythonpath
(delete 'check) (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
(add-after 'install 'add-install-to-pythonpath (add-after 'add-install-to-pythonpath 'pre-check
(assoc-ref python:%standard-phases 'add-install-to-pythonpath)) (lambda _
(add-after 'add-install-to-pythonpath 'pre-check (system "Xvfb :1 &")
(lambda _ (setenv "DISPLAY" ":1")))
(system "Xvfb :1 &") (add-after 'pre-check 'check
(setenv "DISPLAY" ":1"))) (lambda* (#:key tests? #:allow-other-keys)
(add-after 'pre-check 'check (when tests?
(lambda* (#:key tests? #:allow-other-keys) (with-directory-excursion ".."
(when tests? (invoke "python3" "-m" "pytest")))))
(with-directory-excursion ".." (add-after 'glib-or-gtk-wrap 'wrap-typelib
(invoke "python3" "-m" "pytest"))))) (lambda _
(add-after 'glib-or-gtk-wrap 'wrap-typelib (for-each
(lambda* (#:key outputs #:allow-other-keys) (lambda (prog)
(let ((out (assoc-ref outputs "out"))) (unless (wrapped-program? prog)
(for-each (wrap-program prog
(lambda (prog) `("GI_TYPELIB_PATH" suffix
(unless (wrapped-program? prog) (,(string-append #$output "/lib/girepository-1.0")
(wrap-program prog ,(getenv "GI_TYPELIB_PATH")))
`("GI_TYPELIB_PATH" suffix ;; icons and schemas
(,(string-append out "/lib/girepository-1.0") `("XDG_DATA_DIRS" suffix
,(getenv "GI_TYPELIB_PATH"))) #$(map
;; icons and schemas (lambda (input)
`("XDG_DATA_DIRS" suffix (file-append (this-package-input input) "/share"))
#$(map '("adwaita-icon-theme" "hicolor-icon-theme"
(lambda (input) "gsettings-desktop-schemas")))
(file-append (this-package-input input) "/share")) ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Cambalache to
'("adwaita-icon-theme" "hicolor-icon-theme" ;; load its own icons in pure environments.
"gsettings-desktop-schemas"))) `("GDK_PIXBUF_MODULE_FILE" =
;; Wrapping GDK_PIXBUF_MODULE_FILE allows Cambalache to (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))
;; load its own icons in pure environments. (find-files (string-append #$output "/bin"))))))))
`("GDK_PIXBUF_MODULE_FILE" = (inputs
(,(getenv "GDK_PIXBUF_MODULE_FILE")))))) (list bash-minimal
(find-files (string-append out "/bin"))))))))) adwaita-icon-theme hicolor-icon-theme
(inputs (list bash-minimal gsettings-desktop-schemas
adwaita-icon-theme hicolor-icon-theme gtk
gsettings-desktop-schemas `(,gtk+ "bin") ; broadwayd
gtk `(,gtk "bin")
`(,gtk+ "bin") ; broadwayd libadwaita
`(,gtk "bin") libhandy
libadwaita (librsvg-for-system)
libhandy python
(librsvg-for-system) python-pygobject
python python-pygobject python-lxml 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
python-pytest xorg-server-for-tests)) python-pytest xorg-server-for-tests))
(home-page "https://gitlab.gnome.org/jpu/cambalache") (home-page "https://gitlab.gnome.org/jpu/cambalache")
(synopsis "Rapid application development tool") (synopsis "Rapid application development tool")
(description "Cambalache is a rapid application development (RAD) tool for (description "Cambalache is a rapid application development (RAD) tool for
Gtk 4 and 3 with a clear model-view-controller (MVC) design and Gtk 4 and 3 with a clear model-view-controller (MVC) design and
data model first philosophy.") data model first philosophy.")
(license (list license:lgpl2.1 (license (list license:lgpl2.1
license:gpl2)))) ; tools license:gpl2)))) ; tools
(define-public libcroco (define-public libcroco
(package (package