diff mbox series

[bug#67874] gnu: distrobox: Update to 1.6.0.1.

Message ID eb8bd481e47aecea043907488a573692c6371b55.1702863974.git.raingloom@riseup.net
State New
Headers show
Series [bug#67874] gnu: distrobox: Update to 1.6.0.1. | expand

Commit Message

Csepp Dec. 18, 2023, 1:46 a.m. UTC 
* gnu/packages/containers.scm (distrobox): Update to 1.6.0.1.

Change-Id: I9f0e5f6bc3ba29918b10e8790a5a9da098c73285
---
Also the package actually works now.

gnu/packages/containers.scm | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)


base-commit: fe86819d8bde674766659c22b215d3a689a8026e
diff mbox series

Patch

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index a3aa9ac1db..ac9de070de 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -42,6 +42,7 @@  (define-module (gnu packages containers)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages python)
   #:use-module (gnu packages networking)
@@ -160,7 +161,7 @@  (define-public conmon
 (define-public distrobox
   (package
     (name "distrobox")
-    (version "1.5.0.2")
+    (version "1.6.0.1")
     (source
      (origin
        (method git-fetch)
@@ -168,23 +169,31 @@  (define-public distrobox
              (url "https://github.com/89luca89/distrobox")
              (commit version)))
        (sha256
-        (base32 "0h6rpgbcmg33vriyzh9nkdxj8yhfn0y35i1wh1zmb7zss3ik9kxj"))
+        (base32 "0kj02phzikz9rddcx2apq3a8zwwfaawc3sfkd4q7f85lpnjxfsji"))
        (file-name (git-file-name name version))))
     (build-system copy-build-system)
     (inputs
      (list podman wget))
     (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'install 'refer-to-inputs
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* (find-files "." "^distrobox[^.]*[^1]$")
-                     (("podman") (search-input-file inputs "/bin/podman"))
-                     (("wget") (search-input-file inputs "/bin/wget"))
-                     (("command -v") "test -x"))))
-               (replace 'install
-                 (lambda _
-                   (invoke "./install" "--prefix" #$output))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'wrap-scripts
+              (lambda _
+                (let ((path (search-path-as-list
+                             '("bin")
+                             (map cadr
+                                  '#$(package-inputs this-package))))
+                      (guile #$(file-append guile-3.0 "/bin/guile")))
+                  (for-each
+                   (lambda (file)
+                     (wrap-script file
+                       #:guile guile
+                       `("PATH" ":" prefix
+                         ,path)))
+                   (find-files (string-append #$output "/bin")))))))
+       #:install-plan ''(("./" "bin/" #:include-regexp ("\\./distrobox[^/]*$"))
+                         ("completions/" "share/bash-completion/completions/"))))
     (home-page "https://distrobox.privatedns.org/")
     (synopsis "Create and start containers highly integrated with the hosts")
     (description