diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
commit | 5bace4c8ad981b66b5c0769b885d0bb0db91a029 (patch) | |
tree | 0f2fb95c23d7990d26aeed71590bb94a3f2e17fe /gnu/packages/xdisorg.scm | |
parent | 653569e878f39345b05110b998f10db3b520ccfe (diff) | |
parent | 20d87dfb453cf27f95c5ef3858e8d096278e1702 (diff) | |
download | guix-5bace4c8ad981b66b5c0769b885d0bb0db91a029.tar guix-5bace4c8ad981b66b5c0769b885d0bb0db91a029.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
* gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e217f2).
Diffstat (limited to 'gnu/packages/xdisorg.scm')
-rw-r--r-- | gnu/packages/xdisorg.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d3f387e150..ca8b951bf4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages icu4c) #:use-module (gnu packages maths) #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) @@ -449,7 +450,7 @@ of the screen selected by mouse.") (define-public slop (package (name "slop") - (version "6.3.43") + (version "6.3.45") (source (origin (method url-fetch) (uri (string-append @@ -458,12 +459,13 @@ of the screen selected by mouse.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kazcnnarc61d3rjysaym9vadf31wisfd3sn076rsjnsldm4y66h")))) + "0lzyjcg6yff1vzlsda45i57khajp56yrmcjfa5faw3i60fnqqiy7")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target (inputs `(("glm" ,glm) + ("icu4c" ,icu4c) ("libxext" ,libxext) ("libxrender" ,libxrender) ("mesa" ,mesa))) |