From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:57766) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSWn0-00028x-RP for guix-patches@gnu.org; Sat, 25 Apr 2020 22:13:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSWn0-0002w0-A0 for guix-patches@gnu.org; Sat, 25 Apr 2020 22:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jSWmz-0002vE-Tc for guix-patches@gnu.org; Sat, 25 Apr 2020 22:13:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jSWmz-0000Nn-Np for guix-patches@gnu.org; Sat, 25 Apr 2020 22:13:01 -0400 Subject: [bug#40753] gnu: spacefm: Add dependencies for extra functionality. Resent-Message-ID: Date: Sat, 25 Apr 2020 22:11:43 -0400 From: Raghav Gururajan Message-ID: <20200425221143.1a587483.raghavgururajan@disroot.org> In-Reply-To: <87h7x8wsr8.fsf@gnu.org> References: <20200421172812.6227b2eb.raghavgururajan@disroot.org> <20200424153558.2aa79ef0.raghavgururajan@disroot.org> <87h7x8wsr8.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/J+O37bNj2nWX/jB4kTgGpdY" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Jan Nieuwenhuizen Cc: 40753@debbugs.gnu.org --MP_/J+O37bNj2nWX/jB4kTgGpdY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Jan! > Pushed to master with small cosmetic change below. > > Thanks for the patch! I accidentally sent the wrong patch that missed some things. So sorry. I have attached a patch with this email to append the previous. Could you please push it as new commit. Thanks! Regards, RG. --MP_/J+O37bNj2nWX/jB4kTgGpdY Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-spacefm-Fix-privilege-management-and-icons.patch >From ea9e9909c2929639c1b6574ae61ca9fb0b319177 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 25 Apr 2020 21:43:25 -0400 Subject: [PATCH] gnu: spacefm: Fix privilege management and icons. * gnu/packages/lxde.scm (spacefm): Fix privilege management and icons. This commit contains changes that were accidentally left out in commit bf37b49cdd345bcedeb7142f61968d3a6e15e8d8. --- gnu/packages/lxde.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9de96a21cb..3fd2eaff69 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -27,6 +27,7 @@ (define-module (gnu packages lxde) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages disk) @@ -276,7 +277,8 @@ with freedesktop.org standard.") ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("bash" ,bash) + `(("adwaita-icon-theme" ,adwaita-icon-theme) ; Hard-coded theme + ("bash" ,bash) ("cairo" ,cairo) ("curlftpfs" ,curlftpfs) ("dbus" ,dbus) @@ -288,21 +290,42 @@ with freedesktop.org standard.") ("gtk+" ,gtk+) ("ifuse" ,ifuse) ("jmtpfs" ,jmtpfs) + ("ktsuss" ,ktsuss) ("libx11" ,libx11) ("lsof" ,lsof) ("pango" ,pango) ("shared-mime-info" ,shared-mime-info) ("startup-notification" ,startup-notification) + ("sudo" ,sudo) ("udevil" ,udevil) ("util-linux" ,util-linux) ("wget" ,wget))) (arguments - `(#:configure-flags (list (string-append "--with-bash-path=" - (assoc-ref %build-inputs "bash") - "/bin/bash") - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc")))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-spacefm-conf + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "etc/spacefm.conf" + (("#terminal_su=/bin/su") + (string-append "terminal_su=" + (string-append (assoc-ref inputs "sudo") + "/bin/sudo")))) + (substitute* "etc/spacefm.conf" + (("#graphical_su=/usr/bin/gksu") + (string-append "graphical_su=" + (string-append (assoc-ref inputs "ktsuss") + "/bin/ktsuss")))) + #t))) + #:configure-flags (list + (string-append "--with-preferable-sudo=" + (assoc-ref %build-inputs "ktsuss") + "/bin/ktsuss") + (string-append "--with-bash-path=" + (assoc-ref %build-inputs "bash") + "/bin/bash") + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc")))) (home-page "https://ignorantguru.github.io/spacefm/") (synopsis "Multi-panel tabbed file manager") (description "SpaceFM is a graphical, multi-panel, tabbed file manager -- 2.26.1 --MP_/J+O37bNj2nWX/jB4kTgGpdY--