* [PATCH] gnu: wxmaxima: Wrap with GSETTINGS_SCHEMA_DIR and XDG_DATA_DIRS.
@ 2016-05-15 7:50 宋文武
2016-05-17 21:14 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: 宋文武 @ 2016-05-15 7:50 UTC (permalink / raw)
To: guix-devel; +Cc: 宋文武
Fixes <http://bugs.gnu.org/22709> and <http://bugs.gnu.org/23260>.
* gnu/packages/math.scm (wxmaxima)[arguments]: Wrap with
GSETTINGS_SCHEMA_DIR and XDG_DATA_DIRS.
---
gnu/packages/maths.scm | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 73104a3..3da6e35 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1600,7 +1600,11 @@ point numbers.")
(build-system gnu-build-system)
(inputs
`(("wxwidgets" ,wxwidgets)
- ("maxima" ,maxima)))
+ ("maxima" ,maxima)
+ ;; Runtime support.
+ ("adwaita-icon-theme" ,adwaita-icon-theme)
+ ("gtk+" ,gtk+)
+ ("shared-mime-info" ,shared-mime-info)))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after
@@ -1610,7 +1614,18 @@ point numbers.")
"/bin/wxmaxima")
`("PATH" ":" prefix
(,(string-append (assoc-ref inputs "maxima")
- "/bin"))))
+ "/bin")))
+ ;; For GtkFileChooserDialog.
+ `("GSETTINGS_SCHEMA_DIR" =
+ (,(string-append (assoc-ref inputs "gtk+")
+ "/share/glib-2.0/schemas")))
+ `("XDG_DATA_DIRS" ":" prefix
+ (;; Needed by gdk-pixbuf to know supported icon formats.
+ ,(string-append
+ (assoc-ref inputs "shared-mime-info") "/share")
+ ;; The default icon theme of GTK+.
+ ,(string-append
+ (assoc-ref inputs "adwaita-icon-theme") "/share"))))
#t)))))
(home-page "https://andrejv.github.io/wxmaxima/")
(synopsis "Graphical user interface for the Maxima computer algebra system")
--
2.6.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] gnu: wxmaxima: Wrap with GSETTINGS_SCHEMA_DIR and XDG_DATA_DIRS
@ 2016-05-16 1:15 宋文武
0 siblings, 0 replies; 3+ messages in thread
From: 宋文武 @ 2016-05-16 1:15 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 67 bytes --]
Hi, this is a patch for wxmaxima to hardcode gschemas and icons:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-wxmaxima-Wrap-with-GSETTINGS_SCHEMA_DIR-and-XDG_.patch --]
[-- Type: text/x-patch, Size: 2298 bytes --]
From 67256140dc416c927795db7b01f33a7d3b47a07a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sun, 15 May 2016 15:26:46 +0800
Subject: [PATCH] gnu: wxmaxima: Wrap with GSETTINGS_SCHEMA_DIR and
XDG_DATA_DIRS.
Fixes <http://bugs.gnu.org/22709> and <http://bugs.gnu.org/23260>.
* gnu/packages/math.scm (wxmaxima)[arguments]: Wrap with
GSETTINGS_SCHEMA_DIR and XDG_DATA_DIRS.
---
gnu/packages/maths.scm | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 73104a3..3da6e35 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1600,7 +1600,11 @@ point numbers.")
(build-system gnu-build-system)
(inputs
`(("wxwidgets" ,wxwidgets)
- ("maxima" ,maxima)))
+ ("maxima" ,maxima)
+ ;; Runtime support.
+ ("adwaita-icon-theme" ,adwaita-icon-theme)
+ ("gtk+" ,gtk+)
+ ("shared-mime-info" ,shared-mime-info)))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after
@@ -1610,7 +1614,18 @@ point numbers.")
"/bin/wxmaxima")
`("PATH" ":" prefix
(,(string-append (assoc-ref inputs "maxima")
- "/bin"))))
+ "/bin")))
+ ;; For GtkFileChooserDialog.
+ `("GSETTINGS_SCHEMA_DIR" =
+ (,(string-append (assoc-ref inputs "gtk+")
+ "/share/glib-2.0/schemas")))
+ `("XDG_DATA_DIRS" ":" prefix
+ (;; Needed by gdk-pixbuf to know supported icon formats.
+ ,(string-append
+ (assoc-ref inputs "shared-mime-info") "/share")
+ ;; The default icon theme of GTK+.
+ ,(string-append
+ (assoc-ref inputs "adwaita-icon-theme") "/share"))))
#t)))))
(home-page "https://andrejv.github.io/wxmaxima/")
(synopsis "Graphical user interface for the Maxima computer algebra system")
--
2.6.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: wxmaxima: Wrap with GSETTINGS_SCHEMA_DIR and XDG_DATA_DIRS.
2016-05-15 7:50 [PATCH] gnu: wxmaxima: Wrap with GSETTINGS_SCHEMA_DIR and XDG_DATA_DIRS 宋文武
@ 2016-05-17 21:14 ` Ludovic Courtès
0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2016-05-17 21:14 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <iyzsong@gmail.com> skribis:
> Fixes <http://bugs.gnu.org/22709> and <http://bugs.gnu.org/23260>.
>
> * gnu/packages/math.scm (wxmaxima)[arguments]: Wrap with
> GSETTINGS_SCHEMA_DIR and XDG_DATA_DIRS.
Would ‘glib-or-gtk-build-system’ solve the problem?
If not, this option looks good to me.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-18 1:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-15 7:50 [PATCH] gnu: wxmaxima: Wrap with GSETTINGS_SCHEMA_DIR and XDG_DATA_DIRS 宋文武
2016-05-17 21:14 ` Ludovic Courtès
-- strict thread matches above, loose matches on Subject: below --
2016-05-16 1:15 宋文武
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).