From a6c27f4d2f8a93e0027e38f4d31eb60ed8ed813e Mon Sep 17 00:00:00 2001
From: Giacomo Leidi <goodoldpaul@autistici.org>
Date: Thu, 21 Sep 2023 02:34:15 +0200
Subject: nongnu: signal-desktop: Avoid manually unpacking .deb file.

* nongnu/packages/messaging.scm (signal-desktop)[phases]<unpack>:
Replace with 'setup-cwd;
<symlink-binary-file>: there's no need anymore to care about the
environment-variables file;
[native-inputs]: drop tar.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
---
 nongnu/packages/messaging.scm | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'nongnu')

diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm
index d2d13ab..35ebb49 100644
--- a/nongnu/packages/messaging.scm
+++ b/nongnu/packages/messaging.scm
@@ -116,26 +116,19 @@ its core.")
            #~'("lib/Signal/signal-desktop")
            #:phases
            #~(modify-phases %standard-phases
-               (replace 'unpack
+               (add-after 'binary-unpack 'setup-cwd
                  (lambda _
-                   (invoke "ar" "x" #$source)
-                   (invoke "tar" "xvf" "data.tar.xz")
                    (copy-recursively "usr/" ".")
                    ;; Use the more standard lib directory for everything.
                    (rename-file "opt/" "lib")
                    ;; Remove unneeded files.
                    (delete-file-recursively "usr")
-                   (delete-file "control.tar.gz")
-                   (delete-file "data.tar.xz")
-                   (delete-file "debian-binary")
-                   (delete-file "environment-variables")
                    ;; Fix the .desktop file binary location.
                    (substitute* '("share/applications/signal-desktop.desktop") 
                      (("/opt/Signal/")
                       (string-append #$output "/bin/")))))
-               (add-after 'install 'symlink-binary-file-and-cleanup
+               (add-after 'install 'symlink-binary-file
                  (lambda _
-                   (delete-file (string-append #$output "/environment-variables"))
                    (mkdir-p (string-append #$output "/bin"))
                    (symlink (string-append #$output "/lib/Signal/signal-desktop")
                             (string-append #$output "/bin/signal-desktop"))))
@@ -147,7 +140,6 @@ its core.")
                           (list
                            (string-append #$output "/lib/Signal"))
                           ":")))))))))
-    (native-inputs (list tar))
     (home-page "https://signal.org/")
     (synopsis "Private messenger using the Signal protocol")
     (description "Signal Desktop is an Electron application that links with Signal on Android
-- 
cgit v1.2.3