diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-25 21:15:13 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-25 21:15:13 -0500 |
| commit | 5ade90ba6976a5ce8715de07344985c70c0eda8b (patch) | |
| tree | 7d42618d87ebd8888223e2aa1d0cd5375b3a7712 /gnu/packages/linux.scm | |
| parent | 06aac933e1cc97781db0d28eb86b5d984099a30e (diff) | |
| parent | 94987ebe136569dfe0180277384d7c04e18ab78c (diff) | |
| download | guix-5ade90ba6976a5ce8715de07344985c70c0eda8b.tar.gz | |
Merge branch 'wip-gobject-introspection'
Diffstat (limited to 'gnu/packages/linux.scm')
| -rw-r--r-- | gnu/packages/linux.scm | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3d677f2208..50e90f0da3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1437,7 +1438,7 @@ from the module-init-tools project.") ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "1.10") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append @@ -1445,7 +1446,7 @@ from the module-init-tools project.") version ".tar.gz")) (sha256 (base32 - "1l907bvz6dcykvaq8d4iklvfpb9fyrnh1a29g3c28gkx2hlyn7j0")) + "0shf5vqiz9fdxl95aa1a8vh0xjxwim3psc39wr2xr8lnahf11vva")) (patches (list (search-patch "eudev-rules-directory.patch"))) (modules '((guix build utils))) (snippet @@ -1482,7 +1483,18 @@ from the module-init-tools project.") ;; Work around undefined reference to ;; 'mq_getattr' in sc-daemon.c. - "LDFLAGS=-lrt"))) + "LDFLAGS=-lrt") + #:phases + (alist-cons-before + 'build 'pre-build + ;; The program 'g-ir-scanner' (part of the package + ;; 'gobject-introspection'), to generate .gir files, makes some + ;; library pre-processing. During that phase it looks for the C + ;; compiler as either 'cc' or as defined by the environment variable + ;; 'CC' (with code in 'giscanner/dumper.py'). + (lambda* _ + (setenv "CC" "gcc")) + %standard-phases))) (home-page "http://www.gentoo.org/proj/en/eudev/") (synopsis "Userspace device management") (description "Udev is a daemon which dynamically creates and removes |