[Top][All Lists]

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

01/01: gnu: arandr: Fix build.

From: guix-commits
Subject: 01/01: gnu: arandr: Fix build.
Date: Sun, 5 Jan 2020 11:21:36 -0500 (EST)

kkebreau pushed a commit to branch master
in repository guix.

commit 06c8e87224decebc0a3d5bdc7d2ca13cb2b08299
Author: Kei Kebreau <address@hidden>
Date:   Mon Dec 30 12:37:08 2019 -0500

    gnu: arandr: Fix build.
    This is a follow-up to commit 218c785850d5ecf3a7646d81ce90445419a5103b.
    [arguments]: Remove unnecessary #:python flag.  Add 'wrap-gi-typelib' phase.
    [inputs]: Remove python2-pygtk and add gtk+, python-pycairo, and
    [native-inputs]: Replace python2-docutils with python-docutils.
 gnu/packages/xdisorg.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 99a00e1..1b671c1 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -117,20 +117,28 @@
     (build-system python-build-system)
-     `(#:python ,python-2     ;incompatible with python 3
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-before 'build 'configure
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "screenlayout/"
                (("\"xrandr\"") (string-append "\"" (assoc-ref inputs "xrandr")
+             #t))
+         (add-after 'install 'wrap-gi-typelib
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out               (assoc-ref outputs "out"))
+                   (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
+               (wrap-program (string-append out "/bin/arandr")
+                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
        #:tests? #f)) ;no tests
-    (inputs `(("pygtk" ,python2-pygtk)
+    (inputs `(("gtk+" ,gtk+)
+              ("pycairo" ,python-pycairo)
+              ("pygobject" ,python-pygobject)
               ("xrandr" ,xrandr)))
     (native-inputs `(("gettext"           ,gettext-minimal)
-                     ("python-docutils"   ,python2-docutils)))
+                     ("python-docutils"   ,python-docutils)))
     (home-page "";)
     (synopsis "Another RandR graphical user interface")
     ;; TRANSLATORS: "X11 resize-and-rotate" should not be translated.

reply via email to

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