From bef98b7073624dae613d76a3892b5f1835bb3000 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Thu, 4 Apr 2024 02:25:47 +0200
Subject: [PATCH] .

---
 zilti/packages/utilities.scm | 98 +++++++++++++++++++++++++-----------
 1 file changed, 68 insertions(+), 30 deletions(-)

diff --git a/zilti/packages/utilities.scm b/zilti/packages/utilities.scm
index e22b0fa..9318ac4 100644
--- a/zilti/packages/utilities.scm
+++ b/zilti/packages/utilities.scm
@@ -1,34 +1,72 @@
-(define-module (zilti packages utilities)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (guix build-system trivial)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages))
+(define-module
+  (zilti packages utilities)
+  #:use-module
+  (guix download)
+  #:use-module
+  (guix gexp)
+  #:use-module
+  (guix packages)
+  #:use-module
+  (guix utils)
+  #:use-module
+  (guix build-system trivial)
+  #:use-module
+  ((guix licenses)
+   #:prefix license:)
+  #:use-module
+  (gnu packages)
+  #:use-module
+  ((gnu packages package-management) #:prefix gnu:))
 
 (define-public process-compose
   (package
-    (name "process-compose")
-    (version "0.88.0")
-    (source
-     (origin
-       (method url-fetch/tarbomb)
-       (uri (string-append "https://github.com/F1bonacc1/process-compose/releases/download/v" version "/process-compose_linux_amd64.tar.gz"))
-       (sha256
-        (base32
-         "1fd6pb4gcja48xkxwb16vax884m9c6hddcnxgsvm4c8khfd082v0"))))
-    (build-system trivial-build-system)
-    (arguments
-     (list
-      #:modules '((guix build utils))
-      #:builder #~(let* ((source (assoc-ref %build-inputs "source"))
-                         (output (assoc-ref %outputs "out"))
-                         (out-bin (string-append output "/bin")))
-                    (use-modules (guix build utils))
-                    (install-file (string-append source "/process-compose") out-bin))))
-    (home-page "https://f1bonacc1.github.io/process-compose")
-    (synopsis "Scheduler and orchestrator for processes")
-    (description "Process Compose is a simple and flexible scheduler and orchestrator 
+   (name "process-compose")
+   (version "0.88.0")
+   (source
+    (origin
+     (method url-fetch/tarbomb)
+     (uri
+      (string-append "https://github.com/F1bonacc1/process-compose/releases/download/v" version "/process-compose_linux_amd64.tar.gz"))
+     (sha256
+      (base32
+       "1fd6pb4gcja48xkxwb16vax884m9c6hddcnxgsvm4c8khfd082v0"))))
+   (build-system trivial-build-system)
+   (arguments
+    (list
+     #:modules
+     '((guix build utils))
+     #:builder #~(let*
+                     ((source
+                       (assoc-ref %build-inputs "source"))
+                      (output
+                       (assoc-ref %outputs "out"))
+                      (out-bin
+                       (string-append output "/bin")))
+                   (use-modules
+                    (guix build utils))
+                   (install-file
+                    (string-append source "/process-compose")
+                    out-bin))))
+   (home-page "https://f1bonacc1.github.io/process-compose")
+   (synopsis "Scheduler and orchestrator for processes")
+   (description "Process Compose is a simple and flexible scheduler and orchestrator 
 to manage non-containerized applications.")
-    (license license:expat)))
+   (license license:expat)))
+
+(define-public flatpak
+  (package
+   (inherit gnu:flatpak)
+   (name "flatpak")
+   (version "1.14.5")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://github.com/flatpak/flatpak/releases/download/"
+                     version "/flatpak-" version ".tar.xz"))
+     (sha256
+      (base32
+       "1b7z4wzh2zgphcal95vj4x7wbr9s89p2a4c0l0g4w4xcwx6ccw2v"))
+     (patches
+      (search-patches "flatpak-fix-path.patch"))))))
+