From mboxrd@z Thu Jan 1 00:00:00 1970 From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=) Subject: [PATCH] gnu: xfce: =?utf-8?Q?Don=E2=80=99t?= wrap startxfce4. (Re: Xfce collision) Date: Mon, 29 Feb 2016 16:50:26 +0800 Message-ID: <87fuwbrj76.fsf@member.fsf.org> References: <20160225203658.GA24846@solar> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaJaT-0000Hq-1q for guix-devel@gnu.org; Mon, 29 Feb 2016 03:53:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaJaP-0008Qw-1d for guix-devel@gnu.org; Mon, 29 Feb 2016 03:53:52 -0500 Received: from smtp2.openmailbox.org ([62.4.1.36]:52023) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaJaO-0008Qd-Si for guix-devel@gnu.org; Mon, 29 Feb 2016 03:53:48 -0500 In-Reply-To: <20160225203658.GA24846@solar> (Andreas Enge's message of "Thu, 25 Feb 2016 21:36:58 +0100") 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Andreas Enge Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Andreas Enge writes: > Hello, > > when installing xfce, there is a collision with xfce4-session for the file > startxfce4. > > The reason is the following: > (alist-replace > 'install > (lambda* (#:key outputs #:allow-other-keys) > (let* ((out (assoc-ref outputs "out")) > (bin (string-append out "/bin")) > (prog (string-append bin "/startxfce4"))) > (mkdir-p bin) > (symlink (string-append > (assoc-ref %build-inputs "xfce4-session") > "/bin/startxfce4") > prog) > (wrap-program prog > ;; For xfce4-panel plugins. > `("X_XFCE4_LIB_DIRS" =3D ,(list (getenv "X_XFCE4_LIB_DIRS")= ))))) > (propagated-inputs > ... > ("xfce4-session" ,xfce4-session) > > So if I understand correctly, the startxfce4 of xfce will end up being a > wrapped version of the one in xfce4-session. However, if both are install= ed, > could it not be possible that the non-wrapped version ends up in the prof= ile? When only the =E2=80=98xfce=E2=80=99 package is installed, the wrapped vers= ion is used. I don=E2=80=99t know what will happen when both =E2=80=98xfce=E2=80=99 and = =E2=80=98xfce4-session=E2=80=99 are installed to a profile. This package was introduced before the =E2=80=98etc/profile=E2=80=99 where = enviroment variables from search-paths are set. So, the wrapper is redundant now. Here is the patch to remove it: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-xfce-Don-t-wrap-startxfce4.patch >From 6f6ba4e8c347770b279e9344ba49bf305cd41da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 29 Feb 2016 14:57:56 +0800 Subject: [PATCH] gnu: xfce: Don't wrap 'startxfce4'. The necessary environment variables are set by 'etc/profile' now. * gnu/packages/xfce.scm (xfce)[build-system]: Use 'trivial-build-system'. [arguments]: Simplify. --- gnu/packages/xfce.scm | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 0729b1a..b627396 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -24,7 +24,7 @@ #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system gnu) - #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) @@ -690,29 +690,8 @@ on your desktop.") (name "xfce") (version (package-version xfce4-session)) (source #f) - (build-system glib-or-gtk-build-system) - (arguments - '(#:modules ((guix build gnu-build-system) - (guix build glib-or-gtk-build-system) - (guix build utils) - (srfi srfi-26)) - #:phases - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (prog (string-append bin "/startxfce4"))) - (mkdir-p bin) - (symlink (string-append - (assoc-ref %build-inputs "xfce4-session") - "/bin/startxfce4") - prog) - (wrap-program prog - ;; For xfce4-panel plugins. - `("X_XFCE4_LIB_DIRS" = ,(list (getenv "X_XFCE4_LIB_DIRS")))))) - (map (cut assq <> %standard-phases) - '(set-paths install glib-or-gtk-wrap))))) + (build-system trivial-build-system) + (arguments '(#:builder (mkdir %output))) (propagated-inputs `(("exo" ,exo) ("garcon" ,garcon) -- 2.6.3 --=-=-=--