infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nongnu: hplip-plugin: Fix indentation, drop #t return value.

Browse Source 
* nongnu/packages/printers.scm (hplip-plugin): Normalize indentation, remove
 #t return value

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Attila Lendvai 2023-05-12 14:40:06 +02:00 committed by Jonathan Brielmaier
parent 817552dc8b
commit 29e80edd0f
No known key found for this signature in database
GPG Key ID: ECFC83988B4E4B9F
1 changed files with 131 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nongnu/packages/printers.scm
View File

@ -17,12 +17,12 @@
(inherit hplip) (inherit hplip)
(name "hplip-plugin") (name "hplip-plugin")
(description "Hewlett-Packard printer drivers with nonfree plugin.") (description "Hewlett-Packard printer drivers with nonfree plugin.")
(source (origin (inherit (package-source hplip)) (source (origin
(inherit (package-source hplip))
(snippet (snippet
(delete '(for-each (delete '(for-each
delete-file delete-file
(find-files "." (lambda (find-files "." (lambda (file stat)
(file stat)
(elf-file? file)))) (elf-file? file))))
(origin-snippet (package-source hplip)))))) (origin-snippet (package-source hplip))))))
(inputs (alist-delete "python-pyqt" (package-inputs hplip))) (inputs (alist-delete "python-pyqt" (package-inputs hplip)))
@ -38,15 +38,12 @@
"100zyvmqlp71v8691s9wfzrllqq8aaqj9a4pki36gqs1bn4429h3"))))) "100zyvmqlp71v8691s9wfzrllqq8aaqj9a4pki36gqs1bn4429h3")))))
(package-native-inputs hplip))) (package-native-inputs hplip)))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments (package-arguments hplip)
(package-arguments hplip)
((#:configure-flags cf) ((#:configure-flags cf)
`(delete "--enable-qt5" ,cf)) `(delete "--enable-qt5" ,cf))
((#:phases ph) ((#:phases ph)
`(modify-phases `(modify-phases ,ph
,ph (replace 'fix-hard-coded-file-names
(replace
'fix-hard-coded-file-names
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
;; FIXME: use merged ppds (I think actually only ;; FIXME: use merged ppds (I think actually only
@ -98,10 +95,8 @@
(("/var/lib/hp") (("/var/lib/hp")
(string-append (string-append
out out
"/var/lib/hp"))) "/var/lib/hp"))))))
#t))) (add-after 'install-models-dat 'install-plugins
(add-after
'install-models-dat 'install-plugins
(lambda* (#:key outputs system inputs #:allow-other-keys) (lambda* (#:key outputs system inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(state-dir (string-append out "/var/lib/hp")) (state-dir (string-append out "/var/lib/hp"))
@ -158,5 +153,4 @@ version=~A
" ,(package-version hplip)))) " ,(package-version hplip))))
(substitute* (string-append out "/etc/hp/hplip.conf") (substitute* (string-append out "/etc/hp/hplip.conf")
(("/usr") out)) (("/usr") out)))))))))))
#t)))))))))