diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2016-05-02 17:53:40 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2016-05-02 17:53:40 +0200 |
| commit | c3052d6bcd2193b258fb92b99291a4918931fe36 (patch) | |
| tree | 0e0cbbc019e68f4f1c865b4d2f5e341eb45d96ee /gnu/packages/fltk.scm | |
| parent | 0bfb9b439953b755a510974e51e651f79526a5a4 (diff) | |
| parent | b74f64a960542b0679ab13de0dd28adc496cf084 (diff) | |
| download | guix-c3052d6bcd2193b258fb92b99291a4918931fe36.tar guix-c3052d6bcd2193b258fb92b99291a4918931fe36.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/fltk.scm')
| -rw-r--r-- | gnu/packages/fltk.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index 0629d41c0c..bc6b4ab5e6 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,12 +47,14 @@ (sha256 (base32 "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq")) - (patches (list (search-patch "fltk-shared-lib-defines.patch"))))) + (patches (search-patches "fltk-shared-lib-defines.patch" + "fltk-xfont-on-demand.patch")))) (build-system gnu-build-system) (inputs `(("libjpeg" ,libjpeg-8) ;jpeg_read_header argument error in libjpeg-9 ("libpng" ,libpng) ("libx11" ,libx11) + ("libxft" ,libxft) ("mesa" ,mesa) ("zlib" ,zlib))) (arguments |