public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into v/modular

Browse Source 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
This commit is contained in:
Vladimír Čunát
2014-08-31 12:23:18 +02:00
parent 4c3e6a4675 acba6b4da2
commit 8da52a642a
767 changed files with 19114 additions and 13711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/glib/default.nix
View File

@@ -7,6 +7,8 @@
with stdenv.lib;
assert stdenv.gcc.gcc != null;
# TODO:
# * Add gio-module-fam
# Problem: cyclic dependency on gamin
@@ -49,7 +51,7 @@ stdenv.mkDerivation rec {
sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch;
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
#outputs = [ "dev" "out" "bin" ]; # ToDo: no idea what's wrong! docs?
@@ -105,7 +107,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
description = "GLib, a C library of programming buildings blocks";
description = "C library of programming buildings blocks";
homepage = http://www.gtk.org/;
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ lovek323 raskin urkud ];

17
pkgs/development/libraries/glib/skip-timer-test.patch Normal file
View File

@@ -0,0 +1,17 @@
Description: Skip test which performs some unreliable floating point comparisons
Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=722604
Index: b/glib/tests/timer.c
===================================================================
--- a/glib/tests/timer.c
+++ b/glib/tests/timer.c
@@ -203,7 +203,7 @@
{
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/timer/basic", test_timer_basic);
+/* g_test_add_func ("/timer/basic", test_timer_basic);*/
- g_test_add_func ("/timer/stop", test_timer_stop);
+/* g_test_add_func ("/timer/stop", test_timer_stop);*/
g_test_add_func ("/timer/continue", test_timer_continue);
g_test_add_func ("/timer/reset", test_timer_reset);