branch master updated: gnu: quassel: Fix calling inxi script.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 0e1428a  gnu: quassel: Fix calling inxi script.
0e1428a is described below

commit 0e1428ac5dc3a7f1aa68988dd88885009e9706a6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Fri Jul 17 12:32:52 2020 +0300

    gnu: quassel: Fix calling inxi script.
    
    * gnu/packages/irc.scm (quassel)[source]: Only remove bundled inxi script.
    [arguments]: Adjust 'patch-inxi-reference phase to symlink packaged inxi
    to where quassel expects it to be.
---
 gnu/packages/irc.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 81e4205..5abd54b 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -80,12 +80,10 @@
           "0mg8jydc70vlylppzich26q4s40kr78r3ysfyjwisfvlg2byxvs8"))
         (patches (search-patches "quassel-qt-514-compat.patch"))
         (modules '((guix build utils)))
-        ;; We don't want to install the bundled scripts.
+        ;; We don't want to install the bundled inxi script.
         (snippet
          '(begin
-            (delete-file-recursively "data/scripts")
-            (substitute* "data/CMakeLists.txt"
-              (("NOT WIN32") "WIN32"))
+            (delete-file "data/scripts/inxi")
             #t))))
     (build-system cmake-build-system)
     (arguments
@@ -103,8 +101,7 @@
          (add-after 'unpack 'patch-inxi-reference
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((inxi (string-append (assoc-ref inputs "inxi") 
"/bin/inxi")))
-               (substitute* "src/common/aliasmanager.cpp"
-                 ((" inxi ") (string-append " " inxi " ")))
+               (symlink inxi "data/scripts/inxi")
                #t))))
        #:tests? #f)) ; no test target
     (native-inputs