mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
Remove all the 'CC=gcc' hacks for 'g-ir-scanner'.
* gnu/packages/glib.scm (telepathy-glib)[arguments]: Remove. * gnu/packages/gtk.scm (at-spi2-core, gtk+-2): Remove #:make-flags. * gnu/packages/gnome.scm (libpeas, librsvg, vala, vte, json-glib, libxklavier, libsoup, libsecret, colord, geocode-glib, libgweather): Remove #:make-flags or the '(setenv "CC" "gcc")' phase.
This commit is contained in:
parent
702513b51a
commit
b19d6805a9
3 changed files with 6 additions and 58 deletions
|
@ -541,14 +541,6 @@ (define telepathy-glib
|
|||
(base32
|
||||
"1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (alist-cons-before
|
||||
'build 'set-cc
|
||||
(lambda _
|
||||
;; Set $CC so that g-ir-scanner works.
|
||||
(setenv "CC" "gcc")
|
||||
#t)
|
||||
%standard-phases)))
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin") ; uses glib-mkenums
|
||||
("pkg-config" ,pkg-config)
|
||||
|
|
|
@ -499,13 +499,6 @@ (define-public libpeas
|
|||
("glib:bin" ,glib "bin")
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("intltool" ,intltool)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(alist-cons-before
|
||||
'build 'pre-build
|
||||
(lambda* _
|
||||
(setenv "CC" "gcc"))
|
||||
%standard-phases)))
|
||||
(home-page "https://wiki.gnome.org/Libpeas")
|
||||
(synopsis "GObject plugin system")
|
||||
(description
|
||||
|
@ -675,11 +668,7 @@ (define-public librsvg
|
|||
(string-join (find-files (assoc-ref inputs "gdk-pixbuf")
|
||||
"libpixbufloader-.*\\.so") " ")
|
||||
"> " loaders-directory ".cache")))))
|
||||
(alist-cons-before
|
||||
'build 'pre-build
|
||||
(lambda* _
|
||||
(setenv "CC" "gcc"))
|
||||
%standard-phases)))))
|
||||
%standard-phases))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("glib" ,glib "bin") ; glib-mkenums, etc.
|
||||
|
@ -1395,7 +1384,6 @@ (define-public vala
|
|||
(base32
|
||||
"0swyym2papln0f62ah05dpvq3vv6fssap26jq2zqp9dkkaqsn1w4"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments '(#:make-flags '("CC=gcc")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("flex" ,flex)
|
||||
|
@ -1437,13 +1425,6 @@ (define-public vte
|
|||
(propagated-inputs
|
||||
`(("gtk+" ,gtk+) ;required by vte-2.91.pc
|
||||
("gnutls" ,gnutls))) ;ditto
|
||||
(arguments
|
||||
`(#:phases
|
||||
(alist-cons-before
|
||||
'build 'pre-build
|
||||
(lambda* _
|
||||
(setenv "CC" "gcc"))
|
||||
%standard-phases)))
|
||||
(home-page "http://www.gnome.org/")
|
||||
(synopsis "Virtual Terminal Emulator")
|
||||
(description
|
||||
|
@ -1542,14 +1523,6 @@ (define-public json-glib
|
|||
(base32
|
||||
"02k66lpc4cmgygj66n8zcy59bggy7yzm3v4hni9xqplgva9d2yw8"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (alist-cons-before
|
||||
'build 'set-cc
|
||||
(lambda _
|
||||
;; Set $CC so that g-ir-scanner works.
|
||||
(setenv "CC" "gcc")
|
||||
#t)
|
||||
%standard-phases)))
|
||||
(native-inputs
|
||||
`(("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
|
@ -1581,13 +1554,7 @@ (define-public libxklavier
|
|||
'(#:configure-flags
|
||||
(list (string-append "--with-xkb-base="
|
||||
(assoc-ref %build-inputs "xkeyboard-config")
|
||||
"/share/X11/xkb"))
|
||||
#:phases
|
||||
(alist-cons-before
|
||||
'build 'set-cc
|
||||
(lambda _
|
||||
(setenv "CC" "gcc")) ; for g-ir-scanner.
|
||||
%standard-phases)))
|
||||
"/share/X11/xkb"))))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
|
@ -1698,8 +1665,7 @@ (define-public libsoup
|
|||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
`(#:make-flags '("CC=gcc") ; for g-ir-scanner
|
||||
#:configure-flags
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
"/share/gtk-doc/html")
|
||||
|
@ -1762,7 +1728,6 @@ (define-public libsecret
|
|||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: Testing hangs.
|
||||
#:make-flags '("CC=gcc") ; for g-ir-scanner.
|
||||
#:configure-flags
|
||||
(list (string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
|
@ -1926,12 +1891,7 @@ (define-public colord
|
|||
(("/bin/true") (which "true")))
|
||||
(substitute* "src/Makefile.in"
|
||||
(("if test -w \\$\\(DESTDIR\\)\\$\\(prefix\\)/;")
|
||||
"if test -w $(DESTDIR)$(localstatedir);"))))
|
||||
(add-before 'build 'set-cc
|
||||
(lambda _
|
||||
;; Set $CC so that g-ir-scanner works.
|
||||
(setenv "CC" "gcc")
|
||||
#t)))))
|
||||
"if test -w $(DESTDIR)$(localstatedir);")))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
|
@ -2015,7 +1975,6 @@ (define-public geocode-glib
|
|||
`(;; The tests want to write to $HOME/.cache/geocode-glib, which doesn't
|
||||
;; work for the builder. Punt.
|
||||
#:tests? #f
|
||||
#:make-flags '("CC=gcc") ; for g-ir-scanner
|
||||
))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin") ; for glib-mkenums
|
||||
|
@ -2103,7 +2062,6 @@ (define-public libgweather
|
|||
`(;; The tests want to write to $HOME/.cache/geocode-glib, which doesn't
|
||||
;; work for the builder. Punt.
|
||||
#:tests? #f
|
||||
#:make-flags '("CC=gcc") ; for g-ir-scanner
|
||||
#:configure-flags
|
||||
`(;; No introspection for now, as it wants to install to
|
||||
;; gobject-introspection's own directory and I don't know how to easily
|
||||
|
|
|
@ -353,8 +353,7 @@ (define-public at-spi2-core
|
|||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
'(#:make-flags '("CC=gcc") ; for g-ir-scanner
|
||||
#:configure-flags
|
||||
'(#:configure-flags
|
||||
(list (string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
"/share/gtk-doc/html"))
|
||||
|
@ -450,8 +449,7 @@ (define-public gtk+-2
|
|||
("pkg-config" ,pkg-config)
|
||||
("python-wrapper" ,python-wrapper)))
|
||||
(arguments
|
||||
`(#:make-flags '("CC=gcc")
|
||||
#:configure-flags
|
||||
`(#:configure-flags
|
||||
(list "--with-xinput=yes"
|
||||
(string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
|
|
Loading…
Reference in a new issue