me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gdl: Don't use custom bootstrap phase.

Browse source 
* gnu/packages/gnome.scm (gdl)[arguments]: Remove custom boostrap phase.
(gdl-minimal)[arguments]: Don't inherit arguments from gdl.
This commit is contained in:
Efraim Flashner 2020-06-01 08:44:21 +03:00
parent ff8a1a88d9
commit 70cf011390
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/gnome.scm
View file

@ -1518,16 +1518,6 @@ GNOME Desktop.")
(base32 (base32
"154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'bootstrap
(lambda _
;; The autogen.sh script in gnome-common will run ./configure
;; by default, which is problematic because source shebangs
;; have not yet been patched.
(setenv "NOCONFIGURE" "t")
(invoke "sh" "autogen.sh"))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -1554,19 +1544,18 @@ GNOME Desktop.")
(inherit gdl) (inherit gdl)
(name "gdl-minimal") (name "gdl-minimal")
(arguments (arguments
(substitute-keyword-arguments (package-arguments gdl) '(#:phases
((#:phases phases) (modify-phases %standard-phases
`(modify-phases ,phases (add-after 'unpack 'disable-doc-generation
(add-after 'unpack 'disable-doc-generation ;; XXX: There is no easy way to disable generating the
;; XXX: There is no easy way to disable generating the ;; documentation.
;; documentation. (lambda _
(lambda _ (substitute* "configure.in"
(substitute* "configure.in" (("GTK_DOC_CHECK.*") "")
(("GTK_DOC_CHECK.*") "") (("docs/.*") ""))
(("docs/.*") "")) (substitute* "Makefile.am"
(substitute* "Makefile.am" (("gdl docs po") "gdl po"))
(("gdl docs po") "gdl po")) #t)))))
#t))))))
(native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl)))))
(define-public libgnome-keyring (define-public libgnome-keyring