mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-05-27 03:21:49 +02:00
gnu: ibus: Remove trailing #t in phases.
* gnu/packages/ibus.scm (ibus)[phases]: Remove trailing #t.
This commit is contained in:
+9
-18
@@ -100,16 +100,14 @@
|
|||||||
(with-directory-excursion "src/tests"
|
(with-directory-excursion "src/tests"
|
||||||
(substitute* '("ibus-share.c" "ibus-compose.c"
|
(substitute* '("ibus-share.c" "ibus-compose.c"
|
||||||
"ibus-keypress.c")
|
"ibus-keypress.c")
|
||||||
(("[ \t]*return g_test_run \\(\\);") "")))
|
(("[ \t]*return g_test_run \\(\\);") "")))))
|
||||||
#t))
|
|
||||||
(add-after 'unpack 'patch-docbook-xml
|
(add-after 'unpack 'patch-docbook-xml
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(with-directory-excursion "docs/reference/ibus"
|
(with-directory-excursion "docs/reference/ibus"
|
||||||
(substitute* "ibus-docs.sgml.in"
|
(substitute* "ibus-docs.sgml.in"
|
||||||
(("http://www.oasis-open.org/docbook/xml/4.1.2/")
|
(("http://www.oasis-open.org/docbook/xml/4.1.2/")
|
||||||
(string-append (assoc-ref inputs "docbook-xml")
|
(string-append (assoc-ref inputs "docbook-xml")
|
||||||
"/xml/dtd/docbook/"))))
|
"/xml/dtd/docbook/"))))))
|
||||||
#t))
|
|
||||||
(add-after 'unpack 'patch-python-target-directories
|
(add-after 'unpack 'patch-python-target-directories
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let ((root (string-append (assoc-ref outputs "out")
|
(let ((root (string-append (assoc-ref outputs "out")
|
||||||
@@ -120,13 +118,11 @@
|
|||||||
(("(py2?overridesdir)=.*" _ var)
|
(("(py2?overridesdir)=.*" _ var)
|
||||||
(string-append var "=" root "/gi/overrides/"))
|
(string-append var "=" root "/gi/overrides/"))
|
||||||
(("(pkgpython2dir=).*" _ var)
|
(("(pkgpython2dir=).*" _ var)
|
||||||
(string-append var root "/ibus"))))
|
(string-append var root "/ibus"))))))
|
||||||
#t))
|
|
||||||
(add-before 'configure 'disable-dconf-update
|
(add-before 'configure 'disable-dconf-update
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "data/dconf/Makefile.in"
|
(substitute* "data/dconf/Makefile.in"
|
||||||
(("dconf update") "echo dconf update"))
|
(("dconf update") "echo dconf update"))))
|
||||||
#t))
|
|
||||||
(add-after 'unpack 'delete-generated-files
|
(add-after 'unpack 'delete-generated-files
|
||||||
(lambda _
|
(lambda _
|
||||||
(for-each (lambda (file)
|
(for-each (lambda (file)
|
||||||
@@ -134,8 +130,7 @@
|
|||||||
(when (file-exists? c)
|
(when (file-exists? c)
|
||||||
(format #t "deleting ~a\n" c)
|
(format #t "deleting ~a\n" c)
|
||||||
(delete-file c))))
|
(delete-file c))))
|
||||||
(find-files "." "\\.vala"))
|
(find-files "." "\\.vala"))))
|
||||||
#t))
|
|
||||||
(add-after 'unpack 'fix-paths
|
(add-after 'unpack 'fix-paths
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(substitute* "src/ibusenginesimple.c"
|
(substitute* "src/ibusenginesimple.c"
|
||||||
@@ -144,8 +139,7 @@
|
|||||||
"/share/X11/locale")))
|
"/share/X11/locale")))
|
||||||
(substitute* "ui/gtk3/xkblayout.vala"
|
(substitute* "ui/gtk3/xkblayout.vala"
|
||||||
(("\"(setxkbmap|xmodmap)\"" _ prog)
|
(("\"(setxkbmap|xmodmap)\"" _ prog)
|
||||||
(string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\"")))
|
(string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\"")))))
|
||||||
#t))
|
|
||||||
(add-before 'check 'pre-check
|
(add-before 'check 'pre-check
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Tests write to $HOME.
|
;; Tests write to $HOME.
|
||||||
@@ -158,8 +152,7 @@
|
|||||||
(system "Xvfb :1 +extension GLX &")
|
(system "Xvfb :1 +extension GLX &")
|
||||||
(setenv "DISPLAY" ":1")
|
(setenv "DISPLAY" ":1")
|
||||||
;; Tests require running iBus daemon.
|
;; Tests require running iBus daemon.
|
||||||
(system "./bus/ibus-daemon --daemonize")
|
(system "./bus/ibus-daemon --daemonize")))
|
||||||
#t))
|
|
||||||
(add-after 'install 'move-doc
|
(add-after 'install 'move-doc
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
@@ -167,8 +160,7 @@
|
|||||||
(mkdir-p (string-append doc "/share"))
|
(mkdir-p (string-append doc "/share"))
|
||||||
(rename-file
|
(rename-file
|
||||||
(string-append out "/share/gtk-doc")
|
(string-append out "/share/gtk-doc")
|
||||||
(string-append doc "/share/gtk-doc"))
|
(string-append doc "/share/gtk-doc")))))
|
||||||
#t)))
|
|
||||||
(add-after 'wrap-program 'wrap-with-additional-paths
|
(add-after 'wrap-program 'wrap-with-additional-paths
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
|
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
|
||||||
@@ -178,8 +170,7 @@
|
|||||||
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
|
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
|
||||||
`("GI_TYPELIB_PATH" ":" prefix
|
`("GI_TYPELIB_PATH" ":" prefix
|
||||||
(,(getenv "GI_TYPELIB_PATH")
|
(,(getenv "GI_TYPELIB_PATH")
|
||||||
,(string-append out "/lib/girepository-1.0")))))
|
,(string-append out "/lib/girepository-1.0"))))))))))
|
||||||
#t)))))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("dbus" ,dbus)
|
`(("dbus" ,dbus)
|
||||||
("dconf" ,dconf)
|
("dconf" ,dconf)
|
||||||
|
|||||||
Reference in New Issue
Block a user