From 0189037ce497189efeece7b8eaf32101104f3223 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Fri, 2 Dec 2022 18:22:11 -0300
Subject: etc/guix/home.scm: Use exported environment variables over custom
 build of gPodder

---
 etc/guix/home.scm | 20 +-------------------
 etc/sh/rc         |  2 ++
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/etc/guix/home.scm b/etc/guix/home.scm
index 5c81aaf..5549a66 100644
--- a/etc/guix/home.scm
+++ b/etc/guix/home.scm
@@ -112,24 +112,6 @@
       ANSI Common Lisp standard."#)
     (license licenses:public-domain)))
 
-(define gpodder-xdg
-  (package
-    (inherit gpodder)
-    (name "gpodder-xdg")
-    (arguments
-      (substitute-keyword-arguments (package-arguments gpodder)
-        ((#:phases phases '%standard-phases)
-         #~(modify-phases #$phases
-             (add-after 'install 'wrap-with-environment-variables
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (let ((out (assoc-ref outputs "out")))
-                   (for-each
-                    (lambda (bin)
-                      (wrap-program (string-append out "/bin/" bin)
-                        '("GPODDER_HOME"         = ("${XDG_DATA_HOME:-$HOME/.local/share}/gPodder"))
-                        '("GPODDER_DOWNLOAD_DIR" = ("${XDG_DOWNLOAD_DIR:-$HOME/Downloads}/gPodder"))))
-                    '("gpo" "gpodder")))))))))))
-
 (define (xdg-config-home s)
   (string-append (getenv "XDG_CONFIG_HOME") "/" s))
 
@@ -507,6 +489,7 @@
 
             xbacklight
 
+            gpodder
             mate-calc
             gnote
             telegram-desktop
@@ -527,7 +510,6 @@
             firefox))
      (list ;; cmucl
            hunspell-iconv
-           gpodder-xdg
            (hunspell-dictionary-utf8 "en")
            (hunspell-dictionary-utf8 "pt")
            (hunspell-dictionary-utf8 "fr")
diff --git a/etc/sh/rc b/etc/sh/rc
index a443587..adbd1a1 100644
--- a/etc/sh/rc
+++ b/etc/sh/rc
@@ -84,6 +84,8 @@ export LDFLAGS='-flto'
 export LISP='sbcl --eval'
 export N_PROCS GUILE_EFFECTIVE_VERSION
 export LISP_CLI_IMPL=clisp
+export GPODDER_HOME="$XDG_DATA_HOME"/gPodder
+export GPODDER_DOWNLOAD_DIR="$XDG_DOWNLOAD_DIR"/gPodder
 
 add_prefix() {
 	export GUILE_LOAD_PATH="$1/share/guile/site/$GUILE_EFFECTIVE_VERSION${GUILE_LOAD_PATH:+:}${GUILE_LOAD_PATH:-:}"
-- 
cgit v1.2.3