From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sKbZM/R1hmag9AAA62LTzQ:P1 (envelope-from ) for ; Thu, 04 Jul 2024 10:14:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id sKbZM/R1hmag9AAA62LTzQ (envelope-from ) for ; Thu, 04 Jul 2024 12:14:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=Y9foRyXb; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720088052; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=62KH/9tmy3h52w5kDcPewBGhGGAd+8fGK16E2qYH/+I=; b=VHmBbEBq7DbyY66SeNogvUQSg2nepp07RNjMp9oN0BRjqDyUcQlFnySqYoVQzBctyHjkIN 3Gew796TWJpL3uSdBeNlwOse2Sw8rp3X/YBS2AfwA0+bCrJdAB2nS6ThcKHniLH7xhYA+m tA4TmcP4CmumlDq4PdPMxJvQfhJgaYrv2o/tRaW9vxqOoxQNNs/uznDa+TIViqc4CiCT2J DDfsFoscnijTTDhncq3MSLt8ITSE2DcJk0cqFg3pSWaqB4xsgtP3J6F7CR0IleOJ/1CFp2 odA9qBVz5tQ2TGUiWz9QmzowN0sPqi5wOnE5gy9d1kVyLm5b7yOr89wAcZ+XYw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720088052; a=rsa-sha256; cv=none; b=rReXvougqCkzC0P8ZBIk623L8G4xlvailUIBjn95erOCk5plMjTFu2GktxJZgveYVA391U r3YZ8SXY3/+Dd9bMK/p/wBe+cgf1GrSUPOTaRssAEfKP7kC4KhhwGIXIiiZaeZsL8mkfW+ Zx8SZNi/6lnz3wg1fCU0wiuNC/QbVmsV3t5Z4dM0yZ5pTtuTqgiOCcz+iw/q4OODOHq08A KXyhh1KPAV95N/H86nwUJck+ymN8bfI0bmRmKMf3C9MYHSL8HLX+5eT9Tm08jksoCKvC2J fGwPWv2mAZnnSU5YpkUCqslOt4OPFbxx0+H0xoGRXTXqEENVy/wkcYHaZfbrEQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=Y9foRyXb; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C2F151C7A0 for ; Thu, 4 Jul 2024 12:14:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPJTX-0006dv-Ni; Thu, 04 Jul 2024 06:14:03 -0400 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 1sPJTU-0006dR-Ru for guix-patches@gnu.org; Thu, 04 Jul 2024 06:14:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPJTU-00065H-Jd for guix-patches@gnu.org; Thu, 04 Jul 2024 06:14:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPJTW-0001UA-T5 for guix-patches@gnu.org; Thu, 04 Jul 2024 06:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71937] [PATCH 2/2] gnu: distrobox: Patch distrobox-generate-entry. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Jul 2024 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71937 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71937@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 71937-submit@debbugs.gnu.org id=B71937.17200879965641 (code B ref 71937); Thu, 04 Jul 2024 10:14:02 +0000 Received: (at 71937) by debbugs.gnu.org; 4 Jul 2024 10:13:16 +0000 Received: from localhost ([127.0.0.1]:41560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPJSl-0001Sv-Me for submit@debbugs.gnu.org; Thu, 04 Jul 2024 06:13:15 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:47302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPJSj-0001SV-Ht for 71937@debbugs.gnu.org; Thu, 04 Jul 2024 06:13:13 -0400 Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52e94eaf5efso441086e87.2 for <71937@debbugs.gnu.org>; Thu, 04 Jul 2024 03:13:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1720087925; x=1720692725; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=62KH/9tmy3h52w5kDcPewBGhGGAd+8fGK16E2qYH/+I=; b=Y9foRyXbYIUSaFRPA5b5wdJw5asF0yRZ+HUrfdb5jbwkz0gfSKdlqURBFAbuIxf7It MOJNE04bwmKJ7smurQbO6WL8QKlnjZ9xb6ZSSI5Zj3GKtAdy4zMsg3rV14yXevi95yMr /Rk1SiHj99asv/NpMWMWqVg7S5SQALegKudve0ZoLsAWNXpIREYUEJKq/xmE4Nf/PS2n jd/C0L+yKUjLnhIG5H5b0WQDhTUHuNQNppw1alclbfhz2Q98wVLXXMedtyOz1/t/SREf /IGm3k+wDK7305otxVNwo7RuyLstK4vfTDViCzxpRFkKDGv4dcZyV+Cr8Qcg5hpWDhwO clBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720087925; x=1720692725; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=62KH/9tmy3h52w5kDcPewBGhGGAd+8fGK16E2qYH/+I=; b=dMRhXEEufGE+vUyiT0cbF7Q7KVKZaWV27H6liA29Ab7MJvwR3W1mGHqGOYT5Oly8cs rx3WZdYII0zpe7Us3MBj5ffNNpuSRJmQ2S94aY9mz0UFgc9mJTBgBvCsPP6Tt86D1Ul+ hmWazAwAoBDbnOovPg6mCcfpTHgvAdtCwJRjHeYrROm4gGyskjBYwCnqoZaDSZ9+FTVl 4ZDKEHi/f4p77eXgXtCcfOjfy/oIavbGrERM7UJZoNzMdsRTXSa8K4QcgWtxSurMVcre ysIIqxAA0/8IY+x+iBIcE+ZLM07g3zuV/2TLz6nF9caQZ5f4Y+xOy+2+2eknHmo0ceZq Ymzw== X-Gm-Message-State: AOJu0YwDkAQzEkYbhVTMhf30jqBpv+9S+dLAKj0pgi35C09AQj6nAO9R g+WTEYFp+djY6qfJwKzLwRCtXBln63FeAvywkJ+4LWXLVVO0bdRDZCJXXGTABmvGk0CO2KLRKSs I X-Google-Smtp-Source: AGHT+IGe3am7N9eTO/49E1UpjPypcx7e3Ik4SiHCgf1eHNkKC1H+haC1pDr0vBOfwBjsDls615zOXw== X-Received: by 2002:ac2:48b8:0:b0:52c:d904:d26e with SMTP id 2adb3069b0e04-52ea062e377mr798097e87.21.1720087923700; Thu, 04 Jul 2024 03:12:03 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42649dfa25dsm10315125e9.1.2024.07.04.03.12.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 03:12:03 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Thu, 4 Jul 2024 12:11:58 +0200 Message-ID: <83b646b35ad823da12214add2855c89b4c89ab80.1720087651.git.jean@foundation.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: C2F151C7A0 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -3.79 X-Spam-Score: -3.79 X-TUID: GJdCuMp7dnVd Avoids keeping store references in generated desktop files. * gnu/packages/containers.scm (distrobox): add 'patch-distrobox-generate-entry phase. Change-Id: Ib1bffaefa1805accb5227c289c9fc985853bc675 --- gnu/packages/containers.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 9b17f6601e..1bfa18b4b9 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -174,6 +174,14 @@ (define-public distrobox (arguments (list #:phases #~(modify-phases %standard-phases + ;; This script creates desktop files but when the store path for + ;; distrobox changes it leaves the stale path on the desktop + ;; file, so remove the path to use the profile's current + ;; distrobox. + (add-after 'unpack 'patch-distrobox-generate-entry + (lambda _ + (substitute* "distrobox-generate-entry" + (("\\$\\{distrobox_path\\}/distrobox") "distrobox")))) ;; Use WRAP-SCRIPT to wrap all of the scripts of distrobox, ;; excluding the host side ones. (add-after 'install 'wrap-scripts -- 2.45.2