diff options
| author | EuAndreh <eu@euandre.org> | 2023-02-26 17:37:24 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2023-02-26 17:37:24 -0300 |
| commit | f981c764c48946cbc270f04eaecc7a2266d36965 (patch) | |
| tree | db2b0b07b3658f66b4e1fbf3818303d3e51846e2 | |
| parent | etc/guix/home.scm: Inline tmux-plugin-continuum from my personal package (diff) | |
| download | dotfiles-f981c764c48946cbc270f04eaecc7a2266d36965.tar.gz dotfiles-f981c764c48946cbc270f04eaecc7a2266d36965.tar.xz | |
etc/guix/system.scm: Inline latest version of epson-L365 package
| -rw-r--r-- | etc/guix/system.scm | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/etc/guix/system.scm b/etc/guix/system.scm index 94e4e2e..87ee97e 100644 --- a/etc/guix/system.scm +++ b/etc/guix/system.scm @@ -24,6 +24,7 @@ (guix utils) + ((nonguix licenses) #:prefix ng-license:) ((xyz euandreh heredoc) #:prefix heredoc:) (gnu bootloader) (gnu bootloader grub) @@ -51,9 +52,9 @@ (xyz euandreh queue)) (heredoc:enable-syntax) -(define-public epson-L365-x +(define-public epson-L365 (package - (name "epson-L365-x") + (name "epson-L365") (version "1.0.0") (source (origin @@ -76,19 +77,11 @@ (chdir "source") (system (string-append "rpm2cpio " #$source " | cpio -idv")) (invoke "tar" "-xvf" (string-append "epson-inkjet-printer-201401w-" #$version ".tar.gz")) - (invoke "tar" "-xvf" (string-append "epson-inkjet-printer-filter-" #$version ".tar.gz")))) - (add-after 'unpack 'patch-/opt-paths - (lambda* (#:key outputs #:allow-other-keys) + (invoke "tar" "-xvf" (string-append "epson-inkjet-printer-filter-" #$version ".tar.gz")) (substitute* (find-files (string-append "epson-inkjet-printer-201401w-" #$version "/ppds/")) (("/opt/epson-inkjet-printer-201401w/cups/lib") (string-append (assoc-ref outputs "out") "/lib/cups"))) - (substitute* (find-files (string-append "epson-inkjet-printer-201401w-" #$version "/ppds/")) - (("/opt/epson-inkjet-printer-201401w/watermark") - (string-append (assoc-ref outputs "out") - "/watermark"))))) - (add-after 'patch-/opt-paths 'chdir-into-builddir - (lambda _ (chdir (string-append "epson-inkjet-printer-filter-" #$version)))) (add-after 'install 'install-extra-files (lambda* (#:key outputs #:allow-other-keys) @@ -110,9 +103,9 @@ System (CUPS) under Linux. It supplies high quality printing with Seiko Epson Color Ink Jet Printers.") (home-page "https://www.openprinting.org/driver/epson-201401w") - ;; Plus the "SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT": - ;; https://epson.com/SoftwareLicenseAgreement - (license license:lgpl2.1))) + (license ;; SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT + (list (ng-license:nonfree "https://epson.com/SoftwareLicenseAgreement") + license:lgpl2.1)))) (define whoami "andreh") (define priv-statedir (string-append "/var/lib/" whoami)) @@ -463,7 +456,7 @@ Seiko Epson Color Ink Jet Printers.") (cups-configuration (web-interface? #t) (extensions - (list cups-filters epson-L365-x)))) + (list cups-filters epson-L365)))) (service openssh-service-type (openssh-configuration (password-authentication? #f) |