ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hplip: Update to 3.7.11.

Browse source 
* gnu/packages/cups.scm (hplip): Update to 3.7.11.
[source]: Add 'snippet'.
[arguments]: In 'fix-hard-coded-file-names' phase, adjust hack for
$(hplip_statedir) creation.
[inputs]: Add ZLIB.
[native-inputs]: Add PERL.
This commit is contained in:
Ludovic Courtès 2017-12-15 23:30:29 +01:00
parent 5bd3a84109
commit 86c979b794
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/cups.scm
View file

@ -369,14 +369,19 @@ (define-public cups
(define-public hplip (define-public hplip
(package (package
(name "hplip") (name "hplip")
(version "3.17.10") (version "3.17.11")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version (uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz")) "/hplip-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0v27hg856b5z2rilczcbfgz8ksxn0n810g1glac3mxkj8qbl8wqg")))) "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g"))
(modules '((guix build utils)))
(snippet
;; Fix type mismatch.
'(substitute* "prnt/hpcups/genPCLm.cpp"
(("boolean") "bool")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://hplipopensource.com/") (home-page "http://hplipopensource.com/")
(synopsis "HP Printer Drivers") (synopsis "HP Printer Drivers")
@ -436,11 +441,11 @@ (define-public hplip
(("/usr/include/libusb-1.0") (("/usr/include/libusb-1.0")
(string-append (assoc-ref inputs "libusb") (string-append (assoc-ref inputs "libusb")
"/include/libusb-1.0")) "/include/libusb-1.0"))
(("^\tinstall-dist_hplip_stateDATA") (("hplip_statedir =.*$")
;; Remove dependencies on ;; Don't bail out while trying to create
;; 'install-dist_hplip_stateDATA' so we don't bail ;; /var/lib/hplip. We can safely change its value
;; out while trying to create /var/lib/hplip. ;; here because it's hard-coded in the code anyway.
"\t") "hplip_statedir = $(prefix)\n")
(("hplip_confdir = /etc/hp") (("hplip_confdir = /etc/hp")
;; This is only used for installing the default config. ;; This is only used for installing the default config.
(string-append "hplip_confdir = " out (string-append "hplip_confdir = " out
@ -469,12 +474,14 @@ (define-public hplip
("cups-minimal" ,cups-minimal) ("cups-minimal" ,cups-minimal)
("libusb" ,libusb) ("libusb" ,libusb)
("sane-backends" ,sane-backends-minimal) ("sane-backends" ,sane-backends-minimal)
("zlib" ,zlib)
("dbus" ,dbus) ("dbus" ,dbus)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("python" ,python) ("python" ,python)
;; TODO: Make hp-setup find python-dbus. ;; TODO: Make hp-setup find python-dbus.
("python-dbus" ,python-dbus))) ("python-dbus" ,python-dbus)))
(native-inputs `(("pkg-config" ,pkg-config))))) (native-inputs `(("pkg-config" ,pkg-config)
("perl" ,perl)))))
(define-public foomatic-filters (define-public foomatic-filters
(package (package