From mboxrd@z Thu Jan 1 00:00:00 1970 From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=) Subject: Re: [core-updates]: cycle detected in the references of ...gtk+-3.20.9-bin Date: Fri, 14 Oct 2016 23:03:59 +0800 Message-ID: <87oa2n7z1c.fsf@member.fsf.org> References: <20161013052447.GA26607@jasmine> <87mvi8uv74.fsf@member.fsf.org> <87twcg9fu1.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bv42F-0006A3-Op for guix-devel@gnu.org; Fri, 14 Oct 2016 11:04:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bv42A-0006Sa-I3 for guix-devel@gnu.org; Fri, 14 Oct 2016 11:04:34 -0400 In-Reply-To: <87twcg9fu1.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Thu, 13 Oct 2016 22:03:34 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain >> [...] >> Move all the 3 desktop files into 'bin' output should work. (I could >> patch that next day, but won't be able to test it due to slow >> substitute/download/build speed though.) > > That should work. You can post the patch here so we can test, if you > want. Sure, here is it: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-gtk-Move-desktop-files-into-bin-output.patch >From 4746292d8a672dbc3ea8d058baf6239974d92103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Fri, 14 Oct 2016 22:57:53 +0800 Subject: [PATCH] gnu: gtk+: Move desktop files into "bin" output. * gnu/packages/gtk.scm (gtk+)[arguments]: Add 'move-desktop-files' phase. --- gnu/packages/gtk.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 183989b..0de1409 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -685,7 +685,16 @@ application suites.") (substitute* "testsuite/Makefile.in" (("SUBDIRS = gdk gtk a11y css reftests") "SUBDIRS = gdk")) - #t))))) + #t)) + (add-after 'install 'move-desktop-files + ;; Move desktop files into 'bin' to avoid cycle references. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p (string-append bin "/share")) + (rename-file (string-append out "/share/applications") + (string-append bin "/share/applications")) + #t)))))) (native-search-paths (list (search-path-specification (variable "GUIX_GTK3_PATH") -- 2.10.0 --=-=-= Content-Type: text/plain Please test it, Thanks! --=-=-=--