gnu: gtg: Update to 0.6.
* gnu/packages/gnome.scm (gtg): Update to 0.6.
[arguments]: Use gexps.
[imported-modules, modules]: New arguments.
[phases]{python-and-gi-wrap}: Simplify with search-input-file and
site-packages.
[native-inputs]: Delete labels.  Add python.
[inputs]: Add bash-minimal and python.
			
			
This commit is contained in:
		
							parent
							
								
									22bdb55a24
								
							
						
					
					
						commit
						ed26f1cf43
					
				
					 1 changed files with 26 additions and 25 deletions
				
			
		|  | @ -2762,7 +2762,7 @@ and how they are displayed (View).") | ||||||
| (define-public gtg | (define-public gtg | ||||||
|   (package |   (package | ||||||
|     (name "gtg") |     (name "gtg") | ||||||
|     (version "0.5") |     (version "0.6") | ||||||
|     (source |     (source | ||||||
|      (origin |      (origin | ||||||
|        (method git-fetch) |        (method git-fetch) | ||||||
|  | @ -2771,37 +2771,38 @@ and how they are displayed (View).") | ||||||
|              (commit (string-append "v" version)))) |              (commit (string-append "v" version)))) | ||||||
|        (file-name (git-file-name name version)) |        (file-name (git-file-name name version)) | ||||||
|        (sha256 |        (sha256 | ||||||
|         (base32 "0b2slm7kjq6q8c7v4m7aqc8m1ynjxn3bl7445srpv1xc0dilq403")))) |         (base32 "1wcivqp4z3a2jdr2wdrldzwy9v6hlfp5sk0pmh80znlgvl7q3jiv")))) | ||||||
|     (build-system meson-build-system) |     (build-system meson-build-system) | ||||||
|     (arguments |     (arguments | ||||||
|      `(#:glib-or-gtk? #t |      (list | ||||||
|        #:phases |       #:glib-or-gtk? #t | ||||||
|        (modify-phases %standard-phases |       #:imported-modules `(,@%meson-build-system-modules | ||||||
|          (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap |                            (guix build python-build-system)) | ||||||
|            (lambda* (#:key outputs #:allow-other-keys) |       #:modules '((guix build meson-build-system) | ||||||
|              (let ((prog (string-append (assoc-ref outputs "out") |                   ((guix build python-build-system) #:prefix python:) | ||||||
|                                         "/bin/gtg")) |                   (guix build utils)) | ||||||
|                    (pylib (string-append (assoc-ref outputs "out") |       #:phases | ||||||
|                                          "/lib/python" |       #~(modify-phases %standard-phases | ||||||
|                                          ,(version-major+minor |           (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap | ||||||
|                                            (package-version python)) |             (lambda* (#:key inputs outputs #:allow-other-keys) | ||||||
|                                          "/site-packages"))) |               (wrap-program (search-input-file outputs "bin/gtg") | ||||||
|                (wrap-program prog |                 `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") | ||||||
|                  `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) |                                        ,(python:site-packages inputs outputs))) | ||||||
|                  `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) |                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) | ||||||
|                #t)))))) |  | ||||||
|     (native-inputs |     (native-inputs | ||||||
|      `(("desktop-file-utils" ,desktop-file-utils) |      (list desktop-file-utils | ||||||
|        ("gettext" ,gettext-minimal) |            gettext-minimal | ||||||
|        ("glib:bin" ,glib "bin") |            `(,glib "bin") | ||||||
|        ("gobject-introspection" ,gobject-introspection) |            gobject-introspection | ||||||
|        ("gtk+:bin" ,gtk+ "bin") |            pkg-config | ||||||
|        ("pkg-config" ,pkg-config))) |            python)) | ||||||
|     (inputs |     (inputs | ||||||
|      (list librsvg |      (list bash-minimal | ||||||
|  |            librsvg | ||||||
|            gsettings-desktop-schemas |            gsettings-desktop-schemas | ||||||
|            gtk+ |            gtk+ | ||||||
|            pango |            pango | ||||||
|  |            python | ||||||
|            python-dbus |            python-dbus | ||||||
|            python-liblarch |            python-liblarch | ||||||
|            python-lxml |            python-lxml | ||||||
|  |  | ||||||
		Reference in a new issue