diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-03-22 11:19:19 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-03-22 11:19:19 -0400 |
| commit | 1eefbb2693f0f29f8f095af9f067240b85e735aa (patch) | |
| tree | 35dbaa90de4bb52162b176725aa6ac10d8de0e4f /gnu/packages/xorg.scm | |
| parent | b1a01474ac4f5bae1f2689805105103742178c2b (diff) | |
| parent | 6212b8e5d3f08a3ff05111167f0b190cea800c7c (diff) | |
| download | guix-1eefbb2693f0f29f8f095af9f067240b85e735aa.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 13da10d7cb..2e1eeda245 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1260,13 +1260,13 @@ tracking.") "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) (build-system gnu-build-system) (propagated-inputs - ;; xft.pc refers to 'xrender'. - `(("libxrender" ,libxrender))) - (inputs - `(("libx11" ,libx11) - ("xproto" ,xproto) + ;; xft.pc refers to all these. + `(("libxrender" ,libxrender) ("freetype" ,freetype) ("fontconfig" ,fontconfig))) + (inputs + `(("libx11" ,libx11) + ("xproto" ,xproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4731,14 +4731,14 @@ icccm: Both client and window-manager helpers for ICCCM.") (define-public xterm (package (name "xterm") - (version "301") + (version "303") (source (origin (method url-fetch) (uri ; XXX: constant URL! "http://invisible-island.net/datafiles/release/xterm.tar.gz") (sha256 (base32 - "040rarvv18zg0lk7qy0m3n7gv10mh40jic708wvng01z4rlbpfhz")))) + "0n7hay16aam9kfn642ri0wj5yzilbjm3l8znxc2p5dx9pn3rkwla")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-wide-chars" "--enable-256-color" |