guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: pcsxr: Wrap with GSETTINGS_SCHEMA_DIR path v


From: guix-commits
Subject: branch master updated: gnu: pcsxr: Wrap with GSETTINGS_SCHEMA_DIR path variable.
Date: Sun, 26 Jan 2020 19:13:10 -0500

This is an automated email from the git hooks/post-receive script.

kkebreau pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1ef71f5  gnu: pcsxr: Wrap with GSETTINGS_SCHEMA_DIR path variable.
1ef71f5 is described below

commit 1ef71f522577e8b796344e072463d87e5cbae889
Author: Kei Kebreau <address@hidden>
AuthorDate: Sun Jan 26 19:01:00 2020 -0500

    gnu: pcsxr: Wrap with GSETTINGS_SCHEMA_DIR path variable.
    
    Without setting this path variable, gtk+ must be installed in the user's
    profile for pcsxr's GUI to work.
    
    * gnu/packages/emulators.scm (pcsxr)[arguments]: Add 'wrap-program' phase 
and
    return #t from 'cd-subdir' and 'fix-cdio-lookup' phases.
---
 gnu/packages/emulators.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 140a808..23b5ad8 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1478,12 +1478,22 @@ functions.  The source code to MAME serves as this 
documentation.")
          #:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'cd-subdir
-             (lambda _ (chdir "pcsxr")))
+             (lambda _ (chdir "pcsxr") #t))
            (add-before 'configure 'fix-cdio-lookup
              (lambda* (#:key inputs #:allow-other-keys)
                (substitute* "cmake/FindCdio.cmake"
                  (("/usr/include/cdio")
-                  (string-append (assoc-ref inputs "libcdio") 
"/include/cdio"))))))))
+                  (string-append (assoc-ref inputs "libcdio") 
"/include/cdio")))
+               #t))
+           (add-after 'install 'wrap-program
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (wrap-program (string-append (assoc-ref outputs "out")
+                                            "/bin/pcsxr")
+                 ;; For GtkFileChooserDialog.
+                 `("GSETTINGS_SCHEMA_DIR" =
+                   (,(string-append (assoc-ref inputs "gtk+")
+                                    "/share/glib-2.0/schemas"))))
+               #t)))))
       (native-inputs
        `(("pkg-config" ,pkg-config)
          ("intltool" ,intltool)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]