[PATCH] distro: Add GLib.

[Nikita Karetnikov <nikita@karetnikov.org>]

[-- Attachment #1.1: Type: text/plain, Size: 1038 bytes --]

Hi,

This patch adds GLib.  Tests fail:

  /GDateTime/equal:                                                    **
GLib:ERROR:gdatetime.c:193:test_GDateTime_equal: assertion failed (g_date_time_get_utc_offset (dt1) / G_USEC_PER_SEC == (-3 * 3600)): (0 == -10800)
FAIL

[...]

make[4]: *** [test-nonrecursive] Error 143
make[4]: Leaving directory `/tmp/nix-build-glib-2.34.drv-1/glib-2.34.3/glib/tests'
make[3]: *** [check-am] Error 2
make[3]: Leaving directory `/tmp/nix-build-glib-2.34.drv-1/glib-2.34.3/glib/tests'
make[2]: *** [check-recursive] Error 1
make[2]: Leaving directory `/tmp/nix-build-glib-2.34.drv-1/glib-2.34.3/glib'
make[1]: *** [check] Error 2
make[1]: Leaving directory `/tmp/nix-build-glib-2.34.drv-1/glib-2.34.3/glib'
make: *** [check-recursive] Error 1
phase `check' failed after 22 seconds

By the way, I'm running the daemon with the following options:

# ./pre-inst-env guix-daemon -c 0 --build-users-group=nixbld \
> --chroot-directory=/bin --chroot-directory=/dev --chroot-directory=/proc &

Is it OK?

Nikita


[-- Attachment #1.2: 0001-distro-Add-GLib.patch --]
[-- Type: text/x-diff, Size: 3591 bytes --]

From 36fb1f0d6883b622f1c828e87834559a2b609c7b Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Tue, 15 Jan 2013 02:49:01 +0000
Subject: [PATCH] distro: Add GLib.

* distro/packages/glib.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am              |    1 +
 distro/packages/glib.scm |   59 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)
 create mode 100644 distro/packages/glib.scm

diff --git a/Makefile.am b/Makefile.am
index d434d8e..42fbb95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ MODULES =					\
   distro/packages/gdb.scm			\
   distro/packages/gdbm.scm			\
   distro/packages/gettext.scm			\
+  distro/packages/glib.scm			\
   distro/packages/global.scm			\
   distro/packages/gnupg.scm			\
   distro/packages/gnutls.scm			\
diff --git a/distro/packages/glib.scm b/distro/packages/glib.scm
new file mode 100644
index 0000000..bbf64f2
--- /dev/null
+++ b/distro/packages/glib.scm
@@ -0,0 +1,59 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (distro packages glib)
+  #:use-module ((guix licenses) #:select (lgpl2.0+))
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (distro packages base)
+  #:use-module (distro packages compression)
+  #:use-module ((distro packages gettext)
+                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module (distro packages libffi)
+  #:use-module (distro packages pkg-config)
+  #:use-module (distro packages python))
+
+(define-public glib
+  (package
+   (name "glib")
+   (version "2.34")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "http://ftp.gnome.org/pub/gnome/sources/"
+                                name "/" version "/"
+                                name "-" version ".3" ".tar.xz"))
+            (sha256
+             (base32 "19sq4rhl2vr8ikjvl8qh51vr38yqfhbkb3imi2s6ac5rgkwcnpw5"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("coreutils" ,coreutils)
+      ("gettext" ,guix:gettext)
+      ("libffi" ,libffi)
+      ("pkg-config" ,pkg-config)
+      ("python" ,python)
+      ("zlib" ,zlib)))
+   (arguments `(#:tests? #f)) ; XXX: tests fail
+   (synopsis
+    "GLib, a library that provides the core application building blocks")
+   (description
+    "GLib provides data structure handling for C, portability wrappers,
+and interfaces for such runtime functionality as an event loop, threads,
+dynamic loading, and an object system.")
+   (home-page "http://developer.gnome.org/glib/")
+   (license lgpl2.0+))) ; some files are under lgpl2.1+
\ No newline at end of file
-- 
1.7.5.4


[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]