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 yBp0F4SDsF45cwAA0tVLHw (envelope-from ) for ; Mon, 04 May 2020 21:05:08 +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 YIeDIY6DsF7RWwAAB5/wlQ (envelope-from ) for ; Mon, 04 May 2020 21:05:18 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::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 B2476940021 for ; Mon, 4 May 2020 21:05:06 +0000 (UTC) Received: from localhost ([::1]:50296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jViGx-0001e5-5Z for larch@yhetil.org; Mon, 04 May 2020 17:05:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jViGs-0001dk-UO for guix-patches@gnu.org; Mon, 04 May 2020 17:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jViGs-00057X-Jh for guix-patches@gnu.org; Mon, 04 May 2020 17:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jViGs-0007CP-EY for guix-patches@gnu.org; Mon, 04 May 2020 17:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41083] gnu: xfe: Fix hard-coded fhs directories. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 May 2020 21:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41083 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan Cc: 41083@debbugs.gnu.org Received: via spool by 41083-submit@debbugs.gnu.org id=B41083.158862630127663 (code B ref 41083); Mon, 04 May 2020 21:05:02 +0000 Received: (at 41083) by debbugs.gnu.org; 4 May 2020 21:05:01 +0000 Received: from localhost ([127.0.0.1]:34144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jViGr-0007C7-Hx for submit@debbugs.gnu.org; Mon, 04 May 2020 17:05:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jViGp-0007Bu-Mb for 41083@debbugs.gnu.org; Mon, 04 May 2020 17:05:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40590) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jViGj-00055K-Mw; Mon, 04 May 2020 17:04:53 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=54844 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jViGg-0003kd-CY; Mon, 04 May 2020 17:04:51 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200504131624.04c6d30e.raghavgururajan@disroot.org> Date: Mon, 04 May 2020 23:04:48 +0200 In-Reply-To: <20200504131624.04c6d30e.raghavgururajan@disroot.org> (Raghav Gururajan's message of "Mon, 4 May 2020 13:16:24 -0400") Message-ID: <878si7pg27.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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 X-Spam-Score: -1.01 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-1.01 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.49504000197528]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.13), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; RCPT_COUNT_TWO(0.00)[2]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; FROM_NEQ_ENVFROM(0.00)[ludo@gnu.org,guix-patches-bounces@gnu.org]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_HAS_DN(0.00)[]; URIBL_BLOCKED(0.00)[disroot.org:email]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_NA(0.00)[]; DMARC_NA(0.00)[gnu.org]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: QHwKcynuYXsl Hello! Raghav Gururajan skribis: >>>From 660f134e15438e7ee7aec1c076dca93c68e4edc6 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > Date: Mon, 4 May 2020 13:07:02 -0400 > Subject: [PATCH] gnu: xfe: Fix hard-coded fhs directories. > > * gnu/packages/disk.scm (xfe): Fix hard-coded fhs directories. > [arguments]<#:phases>['patch-xfe-paths]: Delete phase. > [arguments]<#:phases>['patch-bin-dirs]: New phase. > [arguments]<#:phases>['patch-share-dirs]: New phase. > [inputs]: New inputs. Nitpick: You don=E2=80=99t need to mention #:phases above, and the angle brackets are inappropriate for inputs. See =E2=80=98git log=E2=80=99 for e= xamples. > - (native-inputs > - `(("intltool" ,intltool) > - ("pkg-config" ,pkg-config))) > - (inputs > - `(("fox" ,fox) > - ("freetype" ,freetype) > - ("x11" ,libx11) > - ("xcb" ,libxcb) > - ("xcb-util" ,xcb-util) > - ("xft" ,libxft) > - ("xrandr" ,libxrandr))) To reduce review time :-), it=E2=80=99s a good idea to avoid unnecessary changes. In this case, you should avoid moving things around because that makes the patch harder to read. > + (substitute* "src/FilePanel.cpp" > + (("/bin/sh") sh) > + (("/usr/bin/du") du) > + (("/usr/bin/sort") sort) > + (("/usr/bin/cut") cut) > + (("/usr/bin/xargs") xargs)) > + (substitute* "src/help.h" > + (("/bin/sh") sh) > + (("/bin/ls") ls)) > + (substitute* "src/SearchPanel.cpp" > + (("/usr/bin/du") du) > + (("/usr/bin/sort") sort) > + (("/usr/bin/cut") cut) > + (("/usr/bin/xargs") xargs)) > + (substitute* "src/startupnotification.cpp" > + (("/bin/sh") sh)) > + (substitute* "src/xfeutils.cpp" > + (("/usr/bin/file") file)) I think you can just define a variable like: (coreutils (assoc-ref inputs "coreutils")) and then use (string-append coreutils "/bin/sort") and so on, instead of defining many variables that have a single user. > (let* > - ((out (assoc-ref outputs "out")) > - (share (string-append out "/share")) > - (xferc (string-append out "/share/xfe/xferc")) > - (xfe-theme (string-append out "/share/xfe/icons/xfe-= theme"))) > - ;; Correct path for xfe registry. > + ((out > + (assoc-ref outputs "out")) > + (share > + (string-append out "/share")) > + (xfe > + (string-append out "/share/xfe")) Avoid the indentation changes (previous version was fine, although we usually start the list of bindings on the same line as =E2=80=98let*=E2=80= =99). > - ;; Correct path for xfe icons. > - (substitute* "src/xfedefs.h" > - (((string-append > - "~/.config/xfe/icons/xfe-theme:" > - "/usr/local/share/xfe/icons/xfe-theme:" > - "/usr/share/xfe/icons/xfe-theme")) > - xfe-theme)) The ~/.config/xfe bit is going away, right? Could you send an updated patch? Thanks, Ludo=E2=80=99.