summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2023-03-05 00:11:51 +0100
committerRicardo Wurmus <rekado@elephly.net>2023-03-05 00:13:01 +0100
commit21f9edb051a2ae618bb4131582efbf32e80d9253 (patch)
treead55fbcec7320359eea176b056d13952e0b39960
parentd6045055720bc0763f8a079d75b941b4898349a4 (diff)
downloadguix-patches-21f9edb051a2ae618bb4131582efbf32e80d9253.tar
guix-patches-21f9edb051a2ae618bb4131582efbf32e80d9253.tar.gz
gnu: sugar: Patch additional references to tools.
* gnu/packages/sugar.scm (sugar)[inputs]: Add ethtool, openssh, and xdg-user-dirs. [arguments]: Patch references to ssh-keygen, xdg-user-dir, ethtool, and locale.
-rw-r--r--gnu/packages/sugar.scm21
1 files changed, 20 insertions, 1 deletions
diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm
index d6c392fe6c..892ccf246f 100644
--- a/gnu/packages/sugar.scm
+++ b/gnu/packages/sugar.scm
@@ -28,12 +28,14 @@
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages networking)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages search)
#:use-module (gnu packages sphinx)
+ #:use-module (gnu packages ssh)
#:use-module (gnu packages time)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xorg)
@@ -87,6 +89,12 @@
(string-append "'" (search-input-file inputs "/bin/metacity") "'"))
(("'metacity-message")
(string-append "'" (search-input-file inputs "/bin/metacity-message"))))
+ (substitute* "src/jarabe/intro/window.py"
+ (("ssh-keygen")
+ (search-input-file inputs "/bin/ssh-keygen")))
+ (substitute* "src/jarabe/journal/model.py"
+ (("xdg-user-dir")
+ (search-input-file inputs "/bin/xdg-user-dir")))
(substitute* "extensions/cpsection/datetime/model.py"
(("/usr/share/zoneinfo/zone.tab")
(search-input-file inputs "/share/zoneinfo/zone.tab")))
@@ -103,6 +111,14 @@
"src/jarabe/model/brightness.py")
(("spawn_command_line_sync\\(cmd\\)")
"spawn_command_line_sync(cmd, 0)"))
+ (substitute* "extensions/cpsection/aboutcomputer/model.py"
+ (("ethtool")
+ (search-input-file inputs "/sbin/ethtool")))
+ (substitute* "extensions/cpsection/language/model.py"
+ (("'locale'")
+ (string-append "'"
+ (search-input-file inputs "/bin/locale")
+ "'")))
;; XXX: The brightness component crashes, so we disable it here.
(substitute* "src/jarabe/main.py"
(("brightness.get_instance\\(\\)") ""))
@@ -127,12 +143,15 @@
(find-files (string-append #$output "/bin") "^sugar.*")))))))
(inputs
(list bash-minimal
+ ethtool
gtk+
metacity
mobile-broadband-provider-info
+ openssh ;for ssh-keygen
python
sugar-toolkit-gtk3
- tzdata))
+ tzdata
+ xdg-user-dirs))
;; Some packages are propagated so that they can be used with gobject
;; introspection at runtime; others are propagated for their dbus
;; services.