diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-09 17:02:08 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-09 17:02:08 +0100 |
| commit | 64461ba20a07a0cf3197de3e97cb44e0f66cebdc (patch) | |
| tree | f48fd8e66879da30d5e2d89b16de6294ecd1192d /gnu/packages/cups.scm | |
| parent | 55174e668f2985d1c4efda4fbf58f4061dde0db2 (diff) | |
| parent | cee9ab244f9ba9f3156b6aa50927418bae951096 (diff) | |
| download | patches-64461ba20a07a0cf3197de3e97cb44e0f66cebdc.tar patches-64461ba20a07a0cf3197de3e97cb44e0f66cebdc.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/cups.scm')
| -rw-r--r-- | gnu/packages/cups.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index d7db5dd1fa..4343910d59 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -391,9 +391,13 @@ device-specific programs to convert and print many types of files.") (base32 "0g3q5mm2crjyc1z4z6gv4lam6sc5d3diz704djrnpqadk4q3h290")) (modules '((guix build utils))) + (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet - ;; Fix type mismatch. '(begin + ;; Delete non-free blobs + (for-each delete-file (find-files "." "\\.so$")) + (delete-file "prnt/hpcups/ImageProcessor.h") + ;; Fix type mismatch. (substitute* "prnt/hpcups/genPCLm.cpp" (("boolean") "bool")) #t)))) |