From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GAc2D+9ewV4ZUAAA0tVLHw (envelope-from ) for ; Sun, 17 May 2020 15:57:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gEARC+9ewV6WTQAAB5/wlQ (envelope-from ) for ; Sun, 17 May 2020 15:57:35 +0000 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 D1DEC940CFA for ; Sun, 17 May 2020 15:57:34 +0000 (UTC) Received: from localhost ([::1]:33664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaLfR-0002tx-Qw for larch@yhetil.org; Sun, 17 May 2020 11:57:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaLew-0002H7-O8 for guix-patches@gnu.org; Sun, 17 May 2020 11:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaLew-0007QF-Ep for guix-patches@gnu.org; Sun, 17 May 2020 11:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaLew-0005fZ-ES for guix-patches@gnu.org; Sun, 17 May 2020 11:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41365] [PATCH 4/5] gnu: godot: Install provided .desktop file and icons. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 15:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41365 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41365@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 41365-submit@debbugs.gnu.org id=B41365.158973096921693 (code B ref 41365); Sun, 17 May 2020 15:57:02 +0000 Received: (at 41365) by debbugs.gnu.org; 17 May 2020 15:56:09 +0000 Received: from localhost ([127.0.0.1]:44396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaLe5-0005dp-0h for submit@debbugs.gnu.org; Sun, 17 May 2020 11:56:09 -0400 Received: from araneo.si ([90.157.193.204]:49474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaLdp-0005b1-Sg for 41365@debbugs.gnu.org; Sun, 17 May 2020 11:56:08 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id d5a8d848 for <41365@debbugs.gnu.org>; Sun, 17 May 2020 15:55:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=6k1LxcDxYLDd/wMNiRRkd Gb6T1E=; b=vhBvMq751rWgDOKl5U3m2R6rhQDs3tvs9Gt0U6uC6yqicYvntwlq6 dXX7DGEMnMkmqhGrUuNg738aNY+AgH5QeVGY6jasq2qE4tVnJ66YbSAg3fzEUAy7 NJand7EYXec8I2Q2w88IRds5X0SB6ej4a/4S6hqskaMT1pdf2rEqEJVgU65WFwEh G8Ka7zNxt82ltqmc2edJBW5B0GffwQNvJU3xvm9F3ivcGJatAwTewH2iZAX/FuJr zuJeL/j01wSZYkUrmK7pntavwZW6IeZT0+xsAr2tw3Wl7J5l/RIic3HLBWYnza+C pfogs5kgyYMij8nNSrf+TEL3CzRMmRXWg== Received: by araneo.si (OpenSMTPD) with ESMTPSA id b244663d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 17 May 2020 15:55:41 +0000 (UTC) From: Timotej Lazar Date: Sun, 17 May 2020 17:55:19 +0200 Message-Id: <20200517155520.26183-4-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200517155520.26183-1-timotej.lazar@araneo.si> References: <20200517155520.26183-1-timotej.lazar@araneo.si> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=araneo.si header.s=20180623 header.b=vhBvMq75; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 5.09 X-TUID: lr9L74bWn/KD * gnu/packages/game-development.scm (godot)[arguments]: Install the provided godot.desktop instead of creating a new one. Copy icons to the correct location in share/icons/hicolor as per XDG. --- gnu/packages/game-development.scm | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 2ed3055cfc..1cbe0e4f0d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1643,24 +1643,18 @@ games.") (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (desktop (string-append out "/share/applications")) - (icon-dir (string-append out "/share/pixmaps"))) - (rename-file "icon.png" "godot.png") - (install-file "godot.png" icon-dir) - (mkdir-p desktop) - (with-output-to-file - (string-append desktop "/godot.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ - Name=godot~@ - Comment=The godot game engine~@ - Exec=~a/bin/godot~@ - TryExec=~@*~a/bin/godot~@ - Icon=godot~@ - Type=Application~%" - out))) - #t)))))) + (applications (string-append out "/share/applications")) + (icons (string-append out "/share/icons/hicolor"))) + (mkdir-p applications) + (copy-file "misc/dist/linux/org.godotengine.Godot.desktop" + (string-append applications "/godot.desktop")) + (for-each (lambda (icon dest) + (mkdir-p (dirname dest)) + (copy-file icon dest)) + '("icon.png" "icon.svg") + `(,(string-append icons "/256x256/apps/godot.png") + ,(string-append icons "/scalable/apps/godot.svg")))) + #t))))) (outputs '("out" "headless")) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) -- 2.26.2