diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-13 10:21:17 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-13 10:21:17 -0500 |
| commit | cc0725914e74c4c4dec369f3e7cdb6f201b3fecd (patch) | |
| tree | e68b452ed625a2db8ed10914fb0968fdc36c655d /gnu/packages/cups.scm | |
| parent | a25b6880f1398ad36aea1d0e4e4105936a8b7e70 (diff) | |
| parent | ce195ba12277ec4286ad0d8ddf7294655987ea9d (diff) | |
| download | guix-cc0725914e74c4c4dec369f3e7cdb6f201b3fecd.tar guix-cc0725914e74c4c4dec369f3e7cdb6f201b3fecd.tar.gz | |
Merge branch 'master' into python-tests
Diffstat (limited to 'gnu/packages/cups.scm')
| -rw-r--r-- | gnu/packages/cups.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 0a8a10ecb4..ca16958352 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -51,7 +51,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.11.5") + (version "1.13.1") (source(origin (method url-fetch) (uri @@ -59,7 +59,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1hcp1cfx1a71aa6fyayajjh7vw1ia7zya6981gz73vsy2pdb23qf")) + "0s7hylp2lcvc1vrqpywpv7lspkrh4xf7cyi4nbg10cf38rshj474")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output @@ -85,12 +85,16 @@ (arguments `(#:make-flags (list (string-append "PREFIX=" %output)) #:configure-flags - `(,(string-append "--with-test-font-path=" + `("--disable-driverless" ; TODO: enable this + ,(string-append "--with-test-font-path=" (assoc-ref %build-inputs "font-dejavu") "/share/fonts/truetype/DejaVuSans.ttf") ,(string-append "--with-gs-path=" (assoc-ref %build-inputs "ghostscript") "/bin/gsc") + ,(string-append "--with-shell=" + (assoc-ref %build-inputs "bash") + "/bin/bash") ,(string-append "--with-rcdir=" (assoc-ref %outputs "out") "/etc/rc.d")))) (native-inputs @@ -100,12 +104,12 @@ `(("avahi" ,avahi) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("font-dejavu" ,font-dejavu) ;needed by test suite + ("font-dejavu" ,font-dejavu) ; also needed by test suite ("ghostscript" ,(force ghostscript/cups)) ("ijs" ,ijs) ("dbus" ,dbus) ("lcms" ,lcms) - ("libjpeg-8" ,libjpeg-8) + ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) ("mupdf" ,mupdf) @@ -416,7 +420,7 @@ device-specific programs to convert and print many types of files.") (inputs `(("libjpeg" ,libjpeg) ("cups-minimal" ,cups-minimal) ("libusb" ,libusb) - ("sane-backends" ,sane-backends) + ("sane-backends" ,sane-backends-minimal) ("dbus" ,dbus) ("python-wrapper" ,python-wrapper) ("python" ,python) |