From patchwork Wed Feb 13 19:22:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 1078 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 A67DB16C17; Wed, 13 Feb 2019 19:30:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 727B816C15 for ; Wed, 13 Feb 2019 19:30:25 +0000 (GMT) Received: from localhost ([127.0.0.1]:33997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0Ej-0002RU-0G for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 14:30:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu0EU-0002Jf-5X for guix-patches@gnu.org; Wed, 13 Feb 2019 14:30:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu07e-0001D7-Qf for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu07b-0000xQ-5y for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu07b-0001ih-16 for guix-patches@gnu.org; Wed, 13 Feb 2019 14:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34470] [PATCH 2/8] gnu: gnome-session: Use absolute paths in .desktop files. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 19:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34470@debbugs.gnu.org Received: via spool by 34470-submit@debbugs.gnu.org id=B34470.15500857776574 (code B ref 34470); Wed, 13 Feb 2019 19:23:02 +0000 Received: (at 34470) by debbugs.gnu.org; 13 Feb 2019 19:22:57 +0000 Received: from localhost ([127.0.0.1]:47318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07V-0001hx-95 for submit@debbugs.gnu.org; Wed, 13 Feb 2019 14:22:57 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:50459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu07T-0001hd-Oz for 34470@debbugs.gnu.org; Wed, 13 Feb 2019 14:22:56 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 9C9CF24608; Wed, 13 Feb 2019 14:22:50 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 14:22:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=xOEVe0I1XPP2qv+/Me0xmtUfAHpol0tOvkz3Yr1HIjU=; b=vDmjQF86 e+7tWUIfaScCruNZG/qc5LWxgkKYs3K/+EfIn2efuxrzlREHMxIcdRLBZYwl7/0h T0yeTv30nozP7MlvgLF7yZ0maYrz7PMuCKfNr/CYDoXzPvLEN/eA1/9VZvN8UHp0 wnbyCAglIHdSWVxreSgwyeSMVZQdZDV1uWGaXfQBtYxng2vQ+z6J1rabYDXXEYUi wE4hgQEyOZ48a6ui7hvGq0twPGcFuDa96XNBuzqLqud2X/ua+ru0oeXfeqlDjS7c EnVxcAMNHT9O6PybWk2E+nb580vpp6p4eiiFYqHYAltHUweG0D5PXtWAv1fHYFe2 6Ds8171nvmOgKA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtfedguddvgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomh epvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthesnhhghihrohdrtghomheq necukfhppeejgedrudduiedrudekiedrgeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hsrghmphhlvghtsehnghihrhhordgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from mrblack.lan (74-116-186-44.qc.dsl.ebox.net [74.116.186.44]) by mail.messagingengine.com (Postfix) with ESMTPA id EC0EFE409D; Wed, 13 Feb 2019 14:22:49 -0500 (EST) From: Timothy Sample Date: Wed, 13 Feb 2019 14:22:15 -0500 Message-Id: <20190213192221.26599-2-samplet@ngyro.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <87o97fijyh.fsf@ngyro.com> References: <87o97fijyh.fsf@ngyro.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches This makes the gnome-session .desktop files usable even if gnome-session is not available from the PATH variable. * gnu/packages/gnome.scm (gnome-session)[arguments]: Add a phase that adds the absolute path of gnome-session in its .desktop files. --- gnu/packages/gnome.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b2c7aa60cc..59e1011a8f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4575,6 +4575,14 @@ such as gzip tarballs.") (out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/gnome-session") `("PATH" ":" prefix (,(string-append glib "/bin")))) + #t))) + (add-after 'install 'add-absolute-paths-to-desktop-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (map (lambda (x) + (string-append out "/share/xsessions/" x)) + '("gnome.desktop" "gnome-xorg.desktop")) + (("gnome-session") (string-append out "/bin/gnome-session"))) #t)))) #:configure-flags