gnu: passwordsafe: Adjust style.
* gnu/packages/gnome.scm (passwordsafe)[arguments]: Rewrite as gexp. Avoid referencing the PYTHON variable. Remove trailing #t. [inputs]: Add PYTHON (explicitly).
This commit is contained in:
		
							parent
							
								
									84e6956d2a
								
							
						
					
					
						commit
						9d680229a5
					
				
					 1 changed files with 17 additions and 17 deletions
				
			
		|  | @ -10719,23 +10719,22 @@ apply fancy special effects and lets you share the fun with others.") | ||||||
|         (base32 "1xh64bbg10gnfzlck5jvqy2zk6hbk9cyqgv85xc9kbdvs8n4lhgh")))) |         (base32 "1xh64bbg10gnfzlck5jvqy2zk6hbk9cyqgv85xc9kbdvs8n4lhgh")))) | ||||||
|     (build-system meson-build-system) |     (build-system meson-build-system) | ||||||
|     (arguments |     (arguments | ||||||
|      `(#:glib-or-gtk? #t |      (list #:glib-or-gtk? #t | ||||||
|        #:meson ,meson-0.59 |            #:meson meson-0.59 | ||||||
|        #:phases |            #:phases | ||||||
|        (modify-phases %standard-phases |            #~(modify-phases %standard-phases | ||||||
|          (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap |                (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap | ||||||
|            (lambda* (#:key outputs #:allow-other-keys) |                  (lambda* (#:key outputs #:allow-other-keys) | ||||||
|              (let ((prog (string-append (assoc-ref outputs "out") |                    (let ((prog (string-append #$output | ||||||
|                                         "/bin/gnome-passwordsafe")) |                                               "/bin/gnome-passwordsafe")) | ||||||
|                    (pylib (string-append (assoc-ref outputs "out") |                          (pylib (string-append | ||||||
|                                          "/lib/python" |                                  #$output "/lib/python" | ||||||
|                                          ,(version-major+minor |                                  #$(version-major+minor | ||||||
|                                            (package-version python)) |                                     (package-version (this-package-input "python"))) | ||||||
|                                          "/site-packages"))) |                                  "/site-packages"))) | ||||||
|                (wrap-program prog |                      (wrap-program prog | ||||||
|                  `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) |                        `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) | ||||||
|                  `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) |                        `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) | ||||||
|                #t)))))) |  | ||||||
|     (native-inputs |     (native-inputs | ||||||
|      (list desktop-file-utils |      (list desktop-file-utils | ||||||
|            gettext-minimal |            gettext-minimal | ||||||
|  | @ -10749,6 +10748,7 @@ apply fancy special effects and lets you share the fun with others.") | ||||||
|            gtk+ |            gtk+ | ||||||
|            libhandy |            libhandy | ||||||
|            libpwquality |            libpwquality | ||||||
|  |            python | ||||||
|            python-pygobject |            python-pygobject | ||||||
|            python-pykeepass)) |            python-pykeepass)) | ||||||
|     (home-page "https://gitlab.gnome.org/World/PasswordSafe") |     (home-page "https://gitlab.gnome.org/World/PasswordSafe") | ||||||
|  |  | ||||||
		Reference in a new issue