;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
+;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages gtk) ;for "cairo"
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
- #:use-module (guix build-system waf))
+ #:use-module (guix build-system waf)
+ #:use-module (srfi srfi-1))
(define-public fltk
(package
(name "fltk")
- (version "1.3.3")
+ (version "1.3.5")
(source
(origin
(method url-fetch)
- (uri (string-append "http://fltk.org/pub/fltk/" version
+ (uri (string-append "http://fltk.org/pub/fltk/"
+ (first (string-split version #\-))
"/fltk-" version "-source.tar.gz"))
(sha256
(base32
- "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq"))
- (patches (search-patches "fltk-shared-lib-defines.patch"
- "fltk-xfont-on-demand.patch"))))
+ "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(inputs
- `(("libjpeg" ,libjpeg-8) ;jpeg_read_header argument error in libjpeg-9
+ `(("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("libxft" ,libxft)
;; Provide -L flags for image libraries when querying fltk-config to
;; avoid propagating inputs.
(lambda* (#:key inputs outputs #:allow-other-keys)
- (use-modules (srfi srfi-26))
- (let* ((conf (string-append (assoc-ref outputs "out")
- "/bin/fltk-config"))
- (jpeg (assoc-ref inputs "libjpeg"))
- (png (assoc-ref inputs "libpng"))
- (zlib (assoc-ref inputs "zlib")))
+ (let ((conf (string-append (assoc-ref outputs "out")
+ "/bin/fltk-config"))
+ (jpeg (assoc-ref inputs "libjpeg"))
+ (png (assoc-ref inputs "libpng"))
+ (zlib (assoc-ref inputs "zlib")))
(substitute* conf
(("-ljpeg") (string-append "-L" jpeg "/lib -ljpeg"))
(("-lpng") (string-append "-L" png "/lib -lpng"))
(("-lz") (string-append "-L" zlib "/lib -lz"))))
#t)))))
- (home-page "http://www.fltk.org")
+ (home-page "https://www.fltk.org")
(synopsis "3D C++ GUI library")
(description "FLTK is a C++ GUI toolkit providing modern GUI functionality
without the bloat. It supports 3D graphics via OpenGL and its built-in GLUT
(define-public ntk
(package
(name "ntk")
- (version "1.3.0")
+ (version "1.3.1000")
(source (origin
(method git-fetch)
(uri (git-reference
(commit (string-append "v" version))))
(sha256
(base32
- "0ggrh6rihf676z1vfgpgcl6kpqwyh39ih0hskcgzklh7fphfik39"))
- (file-name (string-append name "-" version "-checkout"))))
+ "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"))
+ (file-name (git-file-name name version))))
(build-system waf-build-system)
(arguments
`(#:tests? #f ;no "check" target
- #:python ,python-2
#:configure-flags '("--enable-gl")
#:phases
(modify-phases %standard-phases
- (add-before
- 'configure 'set-ldflags
- (lambda* (#:key outputs #:allow-other-keys)
- (setenv "LDFLAGS"
- (string-append "-Wl,-rpath="
- (assoc-ref outputs "out") "/lib")))))))
+ (add-before 'configure 'setup-waf
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((waf (assoc-ref inputs "waf")))
+ (delete-file "waf")
+ (copy-file (string-append waf "/bin/waf") "waf"))
+ #t))
+ (add-before 'configure 'set-ldflags
+ (lambda* (#:key outputs #:allow-other-keys)
+ (setenv "LDFLAGS"
+ (string-append "-Wl,-rpath="
+ (assoc-ref outputs "out") "/lib"))
+ #t)))))
(inputs
- `(("libjpeg" ,libjpeg)
- ("glu" ,glu)))
+ `(("libjpeg" ,libjpeg-turbo)
+ ("glu" ,glu)
+ ("waf" ,python-waf)))
;; ntk.pc lists "x11" and "xft" in Requires.private, and "cairo" in
;; Requires.
(propagated-inputs