diff options
| author | Andreas Enge <andreas@enge.fr> | 2013-09-14 10:45:01 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2013-09-14 10:45:01 +0200 |
| commit | aae4ead8142d4fd7c674a1e6e302f40469f878c6 (patch) | |
| tree | 022987d73c705ca882e50c8a63b578c658a72de6 /gnu/packages/xorg.scm | |
| parent | 29479de5659ba912b486c74078403bbb9a4df104 (diff) | |
| parent | 2875caf5b52340ea16965b1d8f76342cc07bf8b5 (diff) | |
| download | gnu-guix-aae4ead8142d4fd7c674a1e6e302f40469f878c6.tar gnu-guix-aae4ead8142d4fd7c674a1e6e302f40469f878c6.tar.gz | |
Merge branch 'python'
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 98f104b0b6..9a0e3e274b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1857,7 +1857,7 @@ tracking.") "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd")))) (build-system gnu-build-system) (inputs - `(("pkg-config" ,pkg-config) ("python" ,python))) + `(("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4169,7 +4169,7 @@ tracking.") ("libxml2" ,libxml2) ("makedepend" ,makedepend) ("pkg-config" ,pkg-config) - ("python" ,python))) + ("python" ,python-2))) ; incompatible with Python 3 (print syntax) (arguments `(#:configure-flags `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm @@ -4215,7 +4215,7 @@ emulation to complete hardware acceleration for modern GPUs.") `(("xcb-proto" ,xcb-proto) ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) - ("python" ,python))) + ("python" ,python-wrapper))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4270,7 +4270,7 @@ emulation to complete hardware acceleration for modern GPUs.") ("mesa" ,mesa) ("openssl" ,openssl) ("pkg-config" ,pkg-config) - ("python" ,python) + ("python" ,python-wrapper) ("recordproto" ,recordproto) ("resourceproto" ,resourceproto) ("scrnsaverproto" ,scrnsaverproto) |