summaryrefslogtreecommitdiff
path: root/gnu/packages/xdisorg.scm
diff options
context:
space:
mode:
authorKei Kebreau <kkebreau@posteo.net>2019-12-30 12:37:08 -0500
committerKei Kebreau <kkebreau@posteo.net>2020-01-05 11:20:11 -0500
commit06c8e87224decebc0a3d5bdc7d2ca13cb2b08299 (patch)
tree15ccfd53040ecd9e5f20674205dd0e9d7838823e /gnu/packages/xdisorg.scm
parent7366d83191e4cdebc0fb81728f79a3d576fef73b (diff)
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 python-pygobject. [native-inputs]: Replace python2-docutils with python-docutils.
Diffstat (limited to 'gnu/packages/xdisorg.scm')
-rw-r--r--gnu/packages/xdisorg.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 99a00e1df0..1b671c15ac 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -117,20 +117,28 @@
#t))))
(build-system python-build-system)
(arguments
- `(#: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.py"
(("\"xrandr\"") (string-append "\"" (assoc-ref inputs "xrandr")
"/bin/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))))
#t)))
#: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 "https://christian.amsuess.com/tools/arandr/")
(synopsis "Another RandR graphical user interface")
;; TRANSLATORS: "X11 resize-and-rotate" should not be translated.