guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

29/31: gnu: unionfs-fuse-static: Update package style.


From: guix-commits
Subject: 29/31: gnu: unionfs-fuse-static: Update package style.
Date: Sat, 29 Jul 2023 20:05:01 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 76aa16ab61e10bd82fa2e4b42e0fb6a672dc6887
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 23 02:00:00 2023 +0200

    gnu: unionfs-fuse-static: Update package style.
    
    * gnu/packages/linux.scm (unionfs-fuse/static)[source]:
    Rewrite snippet as a G-expression.
    [arguments]: Likewise.  Don't explicitly return #t from phases.
    [inputs]: Remove input labels.
---
 gnu/packages/linux.scm | 54 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 88ee1eafc4..47229492d8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3889,34 +3889,34 @@ UnionFS-FUSE additionally supports copy-on-write.")
   (package (inherit unionfs-fuse)
     (synopsis "User-space union file system (statically linked)")
     (name (string-append (package-name unionfs-fuse) "-static"))
-    (source (origin (inherit (package-source unionfs-fuse))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  ;; Add -ldl to the libraries, because libfuse.a needs that.
-                  (substitute* "src/CMakeLists.txt"
-                    (("target_link_libraries(.*)\\)" _ libs)
-                     (string-append "target_link_libraries"
-                                    libs " dl)")))
-                  #t))))
+    (source
+     (origin
+       (inherit (package-source unionfs-fuse))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            ;; Add -ldl to the libraries, because libfuse.a needs that.
+            (substitute* "src/CMakeLists.txt"
+              (("target_link_libraries(.*)\\)" _ libs)
+               (string-append "target_link_libraries"
+                              libs " dl)")))))))
     (arguments
-     '(#:tests? #f
-       #:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'post-install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (exe (string-append out "/bin/unionfs")))
-               ;; By default, 'unionfs' keeps references to
-               ;; $glibc/share/locale and similar stuff.  Remove them.
-               (remove-store-references exe)
-
-               ;; 'unionfsctl' has references to glibc as well.  Since
-               ;; we don't need it, remove it.
-               (delete-file (string-append out "/bin/unionfsctl"))
-               #t))))))
-    (inputs `(("fuse" ,fuse-static)))))
+     (list
+      #:tests? #f
+      #:configure-flags
+      #~(list "-DCMAKE_EXE_LINKER_FLAGS=-static")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'post-install
+            (lambda _
+              ;; By default, 'unionfs' keeps references to
+              ;; $glibc/share/locale and similar stuff.  Remove them.
+              (remove-store-references (string-append #$output "/bin/unionfs"))
+
+              ;; 'unionfsctl' has references to glibc as well.  Since
+              ;; we don't need it, remove it.
+              (delete-file (string-append #$output "/bin/unionfsctl")))))))
+    (inputs (list fuse-static))))
 
 (define-public sshfs
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]