unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 61780@debbugs.gnu.org
Subject: [bug#61780] [PATCH 1/3] gnu: tracker: Don't wrap binaries in libexec/tracker3 directory.
Date: Sat, 25 Feb 2023 07:46:37 +0100	[thread overview]
Message-ID: <2babe2e18dea3b16a62823437c820eba285c8961.camel@gmail.com> (raw)
In-Reply-To: <bce9be0b391e9e15d4bcfc1208ca91a579770c8e.camel@gmail.com>

These binaries are mere symlinks to the already wrapped tracker command.
They are used in a command lookup via argv[0], which wrapping them breaks.

* gnu/packages/gnome.scm (tracker)[#:phases]: Add ‘unwrap-libexec’.
---
 gnu/packages/gnome.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ff53781b7c..dd9b80ea67 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9707,7 +9707,18 @@ (define-public tracker
                ;; Some tests expect to write to $HOME.
                (setenv "HOME" "/tmp")
                (apply invoke "dbus-run-session" "--" "meson" "test"
-                      "--print-errorlogs" test-options)))))))
+                      "--print-errorlogs" test-options))))
+         (add-after 'glib-or-gtk-wrap 'unwrap-libexec
+           (lambda* (#:key outputs #:allow-other-keys)
+             (with-directory-excursion (string-append (assoc-ref outputs "out")
+                                                      "/libexec/tracker3")
+               (for-each
+                (lambda (f)
+                  (let ((real (string-append "." (basename f) "-real")))
+                    (when (file-exists? real)
+                      (delete-file f)
+                      (rename-file real f))))
+                (find-files "."))))))))
     (native-inputs
      (list gettext-minimal
            `(,glib "bin")
-- 
2.39.1





  reply	other threads:[~2023-02-25  8:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-25  8:09 [bug#61780] [PATCH 0/3] Fix Tracker and update it Liliana Marie Prikler
2023-02-25  6:46 ` Liliana Marie Prikler [this message]
2023-02-25  6:51 ` [bug#61780] [PATCH 2/3] gnu: tracker: Use G-Expressions in arguments Liliana Marie Prikler
2023-02-25  8:08 ` [bug#61780] [PATCH 3/3] gnu: tracker: Update to 3.4.2 Liliana Marie Prikler
2023-03-05  8:57 ` bug#61780: [PATCH 0/3] Fix Tracker and update it Liliana Marie Prikler

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=2babe2e18dea3b16a62823437c820eba285c8961.camel@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=61780@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).