ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-23 21:17:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libxkbcommon: Move to (gnu packages xdisorg).

Browse source 
* gnu/packages/qt.scm (libxkbcommon): Move to...
* gnu/packages/xdisorg.scm (libxkbcommon): ... here.  New variable.
* gnu/packages/wm.scm, gnu/packages/gnome.scm,
gnu/packages/games.scm: Adjust accordingly.
This commit is contained in:
Danny Milosavljevic 2016-05-11 18:24:53 +02:00 committed by Ludovic Courtès
parent 5d38aa0826
commit cf60e76a95
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
5 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/games.scm
View file

@ -93,6 +93,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages xml)
#:use-module (gnu packages tcl)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages xdisorg)
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module (guix build-system haskell)

1
gnu/packages/gnome.scm
View file

@ -93,7 +93,6 @@ (define-module (gnu packages gnome)
#:use-module (gnu packages xml)
#:use-module (gnu packages geeqie)
#:use-module (gnu packages gl)
#:use-module (gnu packages qt) ; for libxkbcommon
#:use-module (gnu packages compression)
#:use-module (gnu packages texlive)
#:use-module (gnu packages tls)

38
gnu/packages/qt.scm
View file

@ -56,44 +56,6 @@ (define-module (gnu packages qt)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xml))
(define-public libxkbcommon
(package
(name "libxkbcommon")
(version "0.5.0")
(source (origin
(method url-fetch)
(uri (string-append "http://xkbcommon.org/download/" name "-"
version ".tar.xz"))
(sha256
(base32
"176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"))))
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)
("libxcb" ,libxcb)
("xkeyboard-config" ,xkeyboard-config)))
(native-inputs
`(("bison" ,bison)
("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list (string-append "--with-xkb-config-root="
(assoc-ref %build-inputs "xkeyboard-config")
"/share/X11/xkb")
(string-append "--with-x-locale-root="
(assoc-ref %build-inputs "libx11")
"/share/X11/locale"))))
(home-page "http://xkbcommon.org/")
(synopsis "Library to handle keyboard descriptions")
(description "Xkbcommon is a library to handle keyboard descriptions,
including loading them from disk, parsing them and handling their
state. It is mainly meant for client toolkits, window systems, and other
system applications; currently that includes Wayland, kmscon, GTK+, Qt,
Clutter, and more. Despite the name, it is not currently used by anything
X11 (yet).")
(license (x11-style "file://COPYING"
"See 'COPYING' in the distribution."))))
(define-public qt
(package
(name "qt")

1
gnu/packages/wm.scm
View file

@ -37,7 +37,6 @@ (define-module (gnu packages wm)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages qt)
#:use-module (gnu packages asciidoc)
#:use-module (gnu packages xml)
#:use-module (gnu packages m4)

42
gnu/packages/xdisorg.scm
View file

@ -54,8 +54,8 @@ (define-module (gnu packages xdisorg)
#:use-module (gnu packages guile)
#:use-module (gnu packages xml)
#:use-module (gnu packages gtk)
#:use-module (gnu packages qt)
#:use-module (gnu packages xorg))
#:use-module (gnu packages xorg)
#:use-module (gnu packages bison))
;; packages outside the x.org system proper
@ -122,6 +122,44 @@ (define-public xclip
avoiding password prompts when X11 forwarding has already been setup.")
(license license:gpl2+)))
(define-public libxkbcommon
(package
(name "libxkbcommon")
(version "0.5.0")
(source (origin
(method url-fetch)
(uri (string-append "http://xkbcommon.org/download/" name "-"
version ".tar.xz"))
(sha256
(base32
"176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"))))
(build-system gnu-build-system)
(inputs
`(("libx11" ,libx11)
("libxcb" ,libxcb)
("xkeyboard-config" ,xkeyboard-config)))
(native-inputs
`(("bison" ,bison)
("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags
(list (string-append "--with-xkb-config-root="
(assoc-ref %build-inputs "xkeyboard-config")
"/share/X11/xkb")
(string-append "--with-x-locale-root="
(assoc-ref %build-inputs "libx11")
"/share/X11/locale"))))
(home-page "http://xkbcommon.org/")
(synopsis "Library to handle keyboard descriptions")
(description "Xkbcommon is a library to handle keyboard descriptions,
including loading them from disk, parsing them and handling their
state. It is mainly meant for client toolkits, window systems, and other
system applications; currently that includes Wayland, kmscon, GTK+, Qt,
Clutter, and more. Despite the name, it is not currently used by anything
X11 (yet).")
(license (license:x11-style "file://COPYING"
"See 'COPYING' in the distribution."))))
(define-public xdotool
(package
(name "xdotool")