guix_mirror_bot pushed a commit to branch master
in repository guix.

commit 69defcd93d414efe6e9e8953b9a967391b7238b9
Author: Cayetano Santos <csant...@inventati.org>
AuthorDate: Mon Jul 28 21:08:55 2025 +0200

    gnu: emacs-stgit: Fix package.
    
    * gnu/packages/version-control.scm (emacs-stgit): Fix package.
    [version]: Set.
    [arguments]<#:phases>: Add patch-version-executables.
    [inputs]: Add stgit-2 and git.
    [license]: Correct to gpl2+.
    
    Change-Id: I77e22d113dac4f59b22b8c80f014ac5edff52c62
    Signed-off-by: Liliana Marie Prikler <liliana.prik...@gmail.com>
---
 gnu/packages/version-control.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 0740dce5cf..ad556f5072 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2254,6 +2254,7 @@ Features include:
   (package
     (inherit stgit-2)
     (name "emacs-stgit")
+    (version "0.17.1")                  ;from stgit.el
     (build-system emacs-build-system)
     (arguments
      (list
@@ -2261,13 +2262,20 @@ Features include:
       #:lisp-directory "contrib"
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-version-executables
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-variables "stgit.el"
+                ("stgit-stg-program" (search-input-file inputs "/bin/stg")))
+              (emacs-substitute-variables "stgit.el"
+                ("stgit-git-program" (search-input-file inputs "/bin/git")))))
           (add-before 'install-license-files 'leave-lisp-directory
             (lambda _
               (chdir ".."))))))
+    (inputs (list stgit-2 git))
     (synopsis "Emacs major mode for StGit interaction")
     (description "This package a interactive tool to interact with git
 branches using StGit.")
-    (license license:gpl3+)))
+    (license license:gpl2+)))
 
 (define-public stgit
   (package

Reply via email to