unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Raghav Gururajan <raghavgururajan@disroot.org>
To: Jan Nieuwenhuizen <janneke@gnu.org>
Cc: 40753@debbugs.gnu.org
Subject: [bug#40753] gnu: spacefm: Add dependencies for extra functionality.
Date: Sat, 25 Apr 2020 22:11:43 -0400	[thread overview]
Message-ID: <20200425221143.1a587483.raghavgururajan@disroot.org> (raw)
In-Reply-To: <87h7x8wsr8.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

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.

[-- Attachment #2: 0001-gnu-spacefm-Fix-privilege-management-and-icons.patch --]
[-- Type: text/x-patch, Size: 3656 bytes --]

From ea9e9909c2929639c1b6574ae61ca9fb0b319177 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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


  reply	other threads:[~2020-04-26  2:13 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-21 21:28 [bug#40753] gnu: spacefm: Add missing dependencies Raghav Gururajan
2020-04-22  0:15 ` [bug#40753] gnu: spacefm: Add and configure missing dependencies. (v2) Raghav Gururajan
2020-04-22  6:46 ` [bug#40753] gnu: spacefm: Add missing dependencies Jan Nieuwenhuizen
2020-04-22 16:28   ` Raghav Gururajan
2020-04-22 17:59     ` Jan Nieuwenhuizen
2020-04-22 20:22       ` [bug#40753] gnu: spacefm: Add missing dependencies. (v3) Raghav Gururajan
2020-04-24 19:35 ` [bug#40753] gnu: spacefm: Add dependencies for extra functionality. (v3) Raghav Gururajan
2020-04-24 20:09   ` Jan Nieuwenhuizen
2020-04-26  2:11     ` Raghav Gururajan [this message]
2020-04-26 14:00       ` [bug#40753] gnu: spacefm: Add dependencies for extra functionality Jan Nieuwenhuizen
2020-04-27  6:29         ` Raghav Gururajan
2020-04-27  6:38           ` Efraim Flashner
2020-04-27  8:42             ` Jan Nieuwenhuizen
2020-04-28  9:11               ` Raghav Gururajan
2020-04-30 13:57                 ` Raghav Gururajan
2020-05-30  5:08                   ` bug#40753: " Maxim Cournoyer
2020-04-27  8:37           ` [bug#40753] " Jan Nieuwenhuizen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200425221143.1a587483.raghavgururajan@disroot.org \
    --to=raghavgururajan@disroot.org \
    --cc=40753@debbugs.gnu.org \
    --cc=janneke@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).