nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: dconf: Adjust inputs and remove obsolete workaround. 

* gnu/packages/gnome.scm (dconf)[inputs]: Remove GLIB and LIBXML2.
[propagated-inputs]: Add GLIB.
[native-inputs]: Add LIBXML2.  Remove INTLTOOL.
[arguments]: Remove #:phases.
This commit is contained in:
Marius Bakke 2018-07-27 03:27:49 +02:00
parent c95c9032b4
commit bc036f4c99
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnu/packages/gnome.scm
View File

@ -2240,16 +2240,17 @@ and RDP protocols.")
(base32 (base32
"0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym")))) "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(propagated-inputs
;; In Requires of dconf.pc.
`(("glib" ,glib)))
(inputs (inputs
`(("gtk+" ,gtk+) `(("gtk+" ,gtk+)
("glib" ,glib) ("dbus" ,dbus)))
("dbus" ,dbus)
("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("libxslt" ,libxslt) `(("libxslt" ,libxslt) ;for xsltproc
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("docbook-xml" ,docbook-xml-4.2) ("docbook-xml" ,docbook-xml-4.2)
("docbook-xsl" ,docbook-xsl) ("docbook-xsl" ,docbook-xsl)
("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id
@ -2258,21 +2259,7 @@ and RDP protocols.")
;; Set the correct RUNPATH in binaries. ;; Set the correct RUNPATH in binaries.
(list (string-append "LDFLAGS=-Wl,-rpath=" (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib") (assoc-ref %outputs "out") "/lib")
"--disable-gtk-doc-html") ; FIXME: requires gtk-doc "--disable-gtk-doc-html"))) ; FIXME: requires gtk-doc
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-docbook
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "docs/Makefile.in"
(("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
(string-append (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl)
"/manpages/docbook.xsl")))
(setenv "XML_CATALOG_FILES"
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/catalog.xml"))
#t)))))
(home-page "https://developer.gnome.org/dconf") (home-page "https://developer.gnome.org/dconf")
(synopsis "Low-level GNOME configuration system") (synopsis "Low-level GNOME configuration system")
(description "Dconf is a low-level configuration system. Its main purpose (description "Dconf is a low-level configuration system. Its main purpose