02/04: gnu: emacs-org-contrib: Use store file name to compute subdir.

[guix-commits]

leoprikler pushed a commit to branch wip-emacs
in repository guix.

commit 6b30373b0d3f8edb872008b2f4ebc151e3bff46c
Author: Leo Prikler <leo.prikler@student.tugraz.at>
AuthorDate: Sun Apr 4 20:19:35 2021 +0200

    gnu: emacs-org-contrib: Use store file name to compute subdir.
    
    This makes it, so that ‘delete-org-files’ does not need to be rewritten, 
when
    emacs-org-contrib is inherited from.
    
    * gnu/packages/emacs-xyz.scm (emacs-org-contrib)[delete-org-files]: Use
    shortened store file name.
---
 gnu/packages/emacs-xyz.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 415d228..fa045e1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11115,8 +11115,10 @@ programming and reproducible research.")
                                                    contrib-files
                                                    org+contrib-files)))
                (with-directory-excursion
-                   (string-append out "/share/emacs/site-lisp/org-contrib-"
-                                  ,version)
+                   (string-append out "/share/emacs/site-lisp/"
+                                  (string-drop
+                                   (strip-store-file-name out)
+                                   (string-length "emacs-")))
                  (for-each delete-file duplicates))
                #t))))))
     (propagated-inputs