diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-03-25 10:52:52 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-25 10:52:52 +0100 |
commit | 25d5b708a636ecf779035f75ad110574fc0262b9 (patch) | |
tree | 7d8429a59b7523d79790c5f4cdb5b96fabe8494e /gnu/packages/xorg.scm | |
parent | 17287d7d47567aa1649250182e0f7ab11d5d55d1 (diff) | |
parent | 614c2188420a266ec512c9c04af3bb2ea46c4dc4 (diff) | |
download | guix-25d5b708a636ecf779035f75ad110574fc0262b9.tar guix-25d5b708a636ecf779035f75ad110574fc0262b9.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r-- | gnu/packages/xorg.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 64e2358fe4..776c858c16 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4344,12 +4344,12 @@ graphics cards.") "1b95p3l84ppv6j7dbbmg0zrz6k8xdwvnag1l6ajm3gk9qwdb79ya")))) (build-system gnu-build-system) (propagated-inputs - `(("libxext" ,libxext) - ("randrproto" ,randrproto))) - (inputs - `(("libxrender" ,libxrender) - ("xproto" ,xproto) - ("libx11" ,libx11))) + ;; In accordance with xrandr.pc. + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrender" ,libxrender) + ("randrproto" ,randrproto) + ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") |