From 88c6b58020c362b47aa907380a5948c8fb31cd0c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 28 Jan 2015 14:27:20 +0100 Subject: gnu: Define $CC to placate 'g-ir-scanner'. * gnu/packages/glib.scm (telepathy-glib)[arguments]: New field. * gnu/packages/gnome.scm (json-glib)[arguments]: New field. --- gnu/packages/glib.scm | 10 +++++++++- gnu/packages/gnome.scm | 12 ++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bbb57335a5..66ee4fae97 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014 Mark H Weaver @@ -536,6 +536,14 @@ useful for C++.") (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) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 535913bcf1..d8b9acf83b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1460,12 +1460,20 @@ configuration storage systems.") (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 + `(("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("glib" ,glib))) ; according to json-glib-1.0.pc + `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") (synopsis "Compiler for the GObject type system") (description "JSON-GLib is a C library based on GLib providing -- cgit v1.2.3