unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Lars-Dominik Braun <lars@6xq.net>
To: 43245@debbugs.gnu.org
Subject: [bug#43245] [PATCH] gnu: xournalpp: Fix path to addr2line binary
Date: Sun, 6 Sep 2020 17:31:46 +0200	[thread overview]
Message-ID: <20200906153146.GA1315@noor.fritz.box> (raw)

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

Hi,

I noticed xournalpp’s crash reporter depends on binutils’ addr2line
binary. When running `guix environment --pure --ad-hoc xournalpp --
xournalpp` you can see lines like `sh: addr2line: command not found`.
The attached patch replaces the path by the build-time binutil’s
version.

Cheers,
Lars

[-- Attachment #2: 0001-gnu-xournalpp-Fix-path-to-addr2line-binary.patch --]
[-- Type: text/x-diff, Size: 1223 bytes --]

From ab65a639b2af2eb67ab325d2bdf0fab07157d9d3 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 6 Sep 2020 17:27:54 +0200
Subject: [PATCH] gnu: xournalpp: Fix path to addr2line binary

* gnu/packages/pdf.scm [arguments]: Add phase substituting path of
addr2line utility.
---
 gnu/packages/pdf.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7649bff695..4c11111323 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -848,6 +848,14 @@ using a stylus.")
              (for-each (lambda (po) (chmod po #o666))
                        (find-files "." "\\.po$"))
              #t))
+         ;; Fix path to addr2line utility, which the crash reporter uses.
+         (add-after 'unpack 'fix-paths
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "src/util/Stacktrace.cpp"
+               ;; Match only the commandline.
+               (("\"addr2line ")
+                (string-append "\"" (which "addr2line") " ")))
+             #t))
          (add-after 'install 'glib-or-gtk-wrap
            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (native-inputs
-- 
2.26.2


             reply	other threads:[~2020-09-06 15:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-06 15:31 Lars-Dominik Braun [this message]
2020-09-07  5:49 ` bug#43245: [PATCH] gnu: xournalpp: Fix path to addr2line binary Mathieu Othacehe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200906153146.GA1315@noor.fritz.box \
    --to=lars@6xq.net \
    --cc=43245@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).