From patchwork Sat Feb 25 06:46:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 47293 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EC2D416B94; Sat, 25 Feb 2023 08:54:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9EC391685E for ; Sat, 25 Feb 2023 08:54:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVqJl-0006bm-NP; Sat, 25 Feb 2023 03:54:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVqJf-0006at-BG for guix-patches@gnu.org; Sat, 25 Feb 2023 03:54:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVqJf-0000y5-2q for guix-patches@gnu.org; Sat, 25 Feb 2023 03:54:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVqJe-0005QE-Bv for guix-patches@gnu.org; Sat, 25 Feb 2023 03:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61780] [PATCH 1/3] gnu: tracker: Don't wrap binaries in libexec/tracker3 directory. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 08:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61780@debbugs.gnu.org Received: via spool by 61780-submit@debbugs.gnu.org id=B61780.167731520420778 (code B ref 61780); Sat, 25 Feb 2023 08:54:02 +0000 Received: (at 61780) by debbugs.gnu.org; 25 Feb 2023 08:53:24 +0000 Received: from localhost ([127.0.0.1]:39002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVqJ2-0005P3-68 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 03:53:24 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:38404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVqJ0-0005Oi-Gj for 61780@debbugs.gnu.org; Sat, 25 Feb 2023 03:53:22 -0500 Received: by mail-ed1-f68.google.com with SMTP id cy6so6464727edb.5 for <61780@debbugs.gnu.org>; Sat, 25 Feb 2023 00:53:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=Ew9+Hg3Jz0rhTfURJFKltUnjaBrurS5D9dOEMNW1Stw=; b=MAHH2PYa17Csv0z9EOy13anBL+ap93zFIjd0qGCt8R5EfYztX7GYeCr1kAIVDFS/TG 7tOqMBvzkBifaWTF6ju4XTdOAkS+mg1LrcShukWFyUMAkh22mCoVOPRJSGNTiZ2VdEUa jecjADHvcpyefnrGDhGErkVKSxCSn4e1i46h6tBy4bZ6qPW4aFvbTVwf2/M2Hl3gHh/g Pshy2n4kRo9BmU9uBaJDLE1t+oaijh4uKuM73Mw9HoF+K1jOtQuEsWrWt5Gj+fRsUAjL FsyCYIwtonOfDunevEEKnwF4Zj8096MHoa1UNRVNnAc+JwEF5gaMVo6JzdyVC3Sihfjq bTvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ew9+Hg3Jz0rhTfURJFKltUnjaBrurS5D9dOEMNW1Stw=; b=gvy7vqch+nPr0cQfhgehfXb/gGii2VWt9YULK1ylIs9KY74IrdH5JT+W/El88QRgh7 Xl6qI1hRH5dKyM01Gajlrb4CjT+VfcXRkyb/oizTS5484AP/bZTZKuZ4tFgg2mZwTDb9 Rr7TrgO5wyeO91YIoS3JsEYLWEn7TAKcJ/zhL1CyBOB8lwiPEbl6OjCAWaVuEVreQ0U1 jCuTPJDrKzh9GIoOzRyB8+y4gzF7R6LuHlx0NoLUtQAY6ahUMUEiOYl7/bg6SNV/Wjf7 yK9exxwsoV67ONRQrVqJ4Ii9zBiUFVJ8PATt9VHvwCAoAKFRsP++bfP+suPSqayAjTOJ a0WA== X-Gm-Message-State: AO0yUKUzc5KtH+6pM6UD+kYYfqMAFMF4swvnBm2jQVCmo9ykD5+Tqso9 7Ws7AkSQZHDX7mZvc0xrvGvxe0+iRhZvsg== X-Google-Smtp-Source: AK7set/dzQotvXw22TBwn5eSP59d9/vf+Ph2VG5lP/7y2wqRrIBpdWp6d34J7FWdUKZH1WbPZN+wCg== X-Received: by 2002:a17:907:d11:b0:8f1:4cb6:8dbd with SMTP id gn17-20020a1709070d1100b008f14cb68dbdmr9387511ejc.10.1677315196608; Sat, 25 Feb 2023 00:53:16 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id y23-20020a50ce17000000b004af6163f845sm603457edi.28.2023.02.25.00.53.15 for <61780@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 00:53:16 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 25 Feb 2023 07:46:37 +0100 MIME-Version: 1.0 Message-ID: <2babe2e18dea3b16a62823437c820eba285c8961.camel@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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")