civodul pushed a commit to branch master
in repository guix.
commit 7a7d5f66412fb74eb94439f3a566230a30ea2f7d
Author: Ludovic Courtès <[email protected]>
Date: Fri Mar 15 22:12:07 2019 +0100
gnu: hplip: Remove pre-built executable from the source.
* gnu/packages/cups.scm (hplip)[source](snippet): Remove all the files
matching 'elf-file?', not just ".so" files. This includes the
'locatedriver' executable found in the upstream tarball.
---
gnu/packages/cups.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 9f23b8e..fa6e3ae 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <[email protected]>
-;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <[email protected]>
+;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <[email protected]>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <[email protected]>
;;; Copyright © 2016 Danny Milosavljevic <[email protected]>
;;; Copyright © 2017 Leo Famulari <[email protected]>
@@ -423,8 +423,12 @@ should only be used as part of the Guix cups-pk-helper
service.")
(patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet
'(begin
- ;; Delete non-free blobs
- (for-each delete-file (find-files "." "\\.so$"))
+ ;; Delete non-free blobs: .so files, pre-compiled
+ ;; 'locatedriver' executable, etc.
+ (for-each delete-file
+ (find-files "."
+ (lambda (file stat)
+ (elf-file? file))))
(delete-file "prnt/hpcups/ImageProcessor.h")
;; Fix type mismatch.
(substitute* "prnt/hpcups/genPCLm.cpp"
