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

Merge remote-tracking branch 'origin/x-updates'

Browse Source
This commit is contained in:
Eelco Dolstra 2012-10-17 12:10:09 -04:00
commit 53f008b854
101 changed files with 2198 additions and 1946 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/monodevelop/default.nix
View File

@ -2,7 +2,7 @@
, gtkmozembedsharp, monodoc , gtkmozembedsharp, monodoc
, perl, perlXMLParser, pkgconfig , perl, perlXMLParser, pkgconfig
, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome , glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
, mozilla , mozilla, makeWrapper
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,8 +14,6 @@ stdenv.mkDerivation {
md5 = "8c33df5629b0676b7ab552854c1de6fd"; md5 = "8c33df5629b0676b7ab552854c1de6fd";
}; };
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
patches = [./prefix.patch]; patches = [./prefix.patch];
buildInputs = [ buildInputs = [
@ -24,5 +22,5 @@ stdenv.mkDerivation {
gtkmozembedsharp monodoc gtkmozembedsharp monodoc
]; ];
inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp; inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper;
} }

6
pkgs/applications/editors/monodoc/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, mono, gtksharp, pkgconfig}: {stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "monodoc-1.0.6"; name = "monodoc-1.0.6";
@ -9,9 +9,7 @@ stdenv.mkDerivation {
md5 = "f2fc27e8e4717d90dc7efa2450625693"; md5 = "f2fc27e8e4717d90dc7efa2450625693";
}; };
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
buildInputs = [mono gtksharp pkgconfig]; buildInputs = [mono gtksharp pkgconfig];
inherit gtksharp; inherit gtksharp makeWrapper;
} }

2
pkgs/applications/graphics/dia/default.nix
View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
patches = [ ./glib-top-level-header.patch ];
meta = { meta = {
description = "Gnome Diagram drawing software"; description = "Gnome Diagram drawing software";
homepage = http://live.gnome.org/Dia; homepage = http://live.gnome.org/Dia;

471
pkgs/applications/graphics/dia/glib-top-level-header.patch Normal file
View File

@ -0,0 +1,471 @@
diff -Naur dia-0.97.2-orig/app/app_procs.c dia-0.97.2/app/app_procs.c
--- dia-0.97.2-orig/app/app_procs.c 2011-03-20 07:18:13.000000000 -0400
+++ dia-0.97.2/app/app_procs.c 2012-07-15 10:49:08.192726306 -0400
@@ -50,7 +50,7 @@
#include <libxml/parser.h>
#include <libxml/xmlerror.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "app_procs.h"
diff -Naur dia-0.97.2-orig/app/dia-win-remote.c dia-0.97.2/app/dia-win-remote.c
--- dia-0.97.2-orig/app/dia-win-remote.c 2010-08-03 11:35:35.000000000 -0400
+++ dia-0.97.2/app/dia-win-remote.c 2012-07-15 10:49:08.159726316 -0400
@@ -35,7 +35,7 @@
#include <shellapi.h>
#include <Shlwapi.h>
#include <glib.h>
-#include <glib/gprintf.h>
+#include <glib.h>
/**
* PROTOTYPES:
diff -Naur dia-0.97.2-orig/app/filedlg.c dia-0.97.2/app/filedlg.c
--- dia-0.97.2-orig/app/filedlg.c 2009-11-07 12:13:53.000000000 -0500
+++ dia-0.97.2/app/filedlg.c 2012-07-15 10:49:08.227726294 -0400
@@ -28,7 +28,7 @@
#include <unistd.h>
#endif
#include <stdio.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#undef GTK_DISABLE_DEPRECATED /* gtk_file_chooser_dialog_new_with_backend */
#include <gtk/gtk.h>
diff -Naur dia-0.97.2-orig/app/load_save.c dia-0.97.2/app/load_save.c
--- dia-0.97.2-orig/app/load_save.c 2011-09-25 07:55:11.000000000 -0400
+++ dia-0.97.2/app/load_save.c 2012-07-15 10:49:08.203726303 -0400
@@ -30,7 +30,7 @@
#include <string.h>
#include <glib.h>
-#include <glib/gstdio.h> /* g_access() and friends */
+#include <glib.h> /* g_access() and friends */
#include <errno.h>
#ifndef W_OK
diff -Naur dia-0.97.2-orig/app/sheets_dialog_callbacks.c dia-0.97.2/app/sheets_dialog_callbacks.c
--- dia-0.97.2-orig/app/sheets_dialog_callbacks.c 2009-11-07 12:13:53.000000000 -0500
+++ dia-0.97.2/app/sheets_dialog_callbacks.c 2012-07-15 10:49:08.201726302 -0400
@@ -44,7 +44,7 @@
#endif
#endif
-#include <glib/gstdio.h>
+#include <glib.h>
#include <gmodule.h>
#undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu */
diff -Naur dia-0.97.2-orig/ChangeLog.pre-git dia-0.97.2/ChangeLog.pre-git
--- dia-0.97.2-orig/ChangeLog.pre-git 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/ChangeLog.pre-git 2012-07-15 10:49:08.384726247 -0400
@@ -4137,7 +4137,7 @@
plug-ins/vdx/vdx-export.c plug-ins/vdx/vdx-import.c
plug-ins/wmf/wmf.cpp plug-ins/wpg/wpg.c
plug-ins/xfig/xfig-export.c plug-ins/xfig/xfig-import.c
- plug-ins/xslt/xslt.c : use <glib/gstdio.h> to match GLib's filename
+ plug-ins/xslt/xslt.c : use <glib.h> to match GLib's filename
encoding to the io functions used, that is: g_open, g_fopen, g_stat,
g_unlink, g_mkdir, g_rename (, g_access, g_lstat, g_remove, g_freopen,
g_chdir, g_rmdir). Also replace gzopen() with gzdopen(g_open(), ...)
@@ -5995,7 +5995,7 @@
Also special case strings starting with \tex - i.e. dont escape them -
to keep the use-case of direct tex input.
- * lib/debug.c : #include <glib/gprintf.h> not just <gprintf.h>
+ * lib/debug.c : #include <glib.h>
2006-01-14 Hans Breuer <hans@breuer.org>
@@ -6207,7 +6207,7 @@
* lib/makefile.msc : build debug.obj
* plug-ins/makefile.msc : building pgf in the right alphabetical order
- * plug-ins/pgf/render_pgf.c : include <glib/gprintf.h>
+ * plug-ins/pgf/render_pgf.c : include <glib.h>
2005-12-08 Lars Clausen <lars@raeder.dk>
diff -Naur dia-0.97.2-orig/lib/debug.c dia-0.97.2/lib/debug.c
--- dia-0.97.2-orig/lib/debug.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/lib/debug.c 2012-07-15 10:49:06.813726730 -0400
@@ -21,7 +21,7 @@
#include <config.h>
#include <stdio.h>
-#include <glib/gprintf.h>
+#include <glib.h>
#include <stdarg.h>
#include "debug.h"
diff -Naur dia-0.97.2-orig/lib/dia_dirs.c dia-0.97.2/lib/dia_dirs.c
--- dia-0.97.2-orig/lib/dia_dirs.c 2009-11-07 12:13:53.000000000 -0500
+++ dia-0.97.2/lib/dia_dirs.c 2012-07-15 10:49:06.740726750 -0400
@@ -30,7 +30,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#endif
-#include <glib/gstdio.h>
+#include <glib.h>
/** Get the name of a subdirectory of our data directory.
* This function does not create the subdirectory, just make the correct name.
diff -Naur dia-0.97.2-orig/lib/dia_xml.c dia-0.97.2/lib/dia_xml.c
--- dia-0.97.2-orig/lib/dia_xml.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/lib/dia_xml.c 2012-07-15 10:49:06.770726743 -0400
@@ -25,7 +25,7 @@
#include <fcntl.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include <libxml/parser.h>
#include <libxml/parserInternals.h>
diff -Naur dia-0.97.2-orig/objects/custom/shape_typeinfo.c dia-0.97.2/objects/custom/shape_typeinfo.c
--- dia-0.97.2-orig/objects/custom/shape_typeinfo.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/objects/custom/shape_typeinfo.c 2012-07-15 10:49:06.639726783 -0400
@@ -27,8 +27,8 @@
#include "custom_util.h"
#include <string.h>
#include <stdarg.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstdio.h>
+#include <glib.h>
+#include <glib.h>
#include <libxml/parser.h>
/*
diff -Naur dia-0.97.2-orig/objects/SISSI/sissi.c dia-0.97.2/objects/SISSI/sissi.c
--- dia-0.97.2-orig/objects/SISSI/sissi.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/objects/SISSI/sissi.c 2012-07-15 10:49:06.570726804 -0400
@@ -42,7 +42,7 @@
#include "dia_xml_libxml.h"
#include <string.h>
-#include <glib/gprintf.h>
+#include <glib.h>
#define DEFAULT_WIDTH 1.0
#define DEFAULT_HEIGHT 1.0
diff -Naur dia-0.97.2-orig/objects/standard/image.c dia-0.97.2/objects/standard/image.c
--- dia-0.97.2-orig/objects/standard/image.c 2009-11-07 12:13:53.000000000 -0500
+++ dia-0.97.2/objects/standard/image.c 2012-07-15 10:49:06.683726770 -0400
@@ -25,7 +25,7 @@
#ifdef HAVE_UNIST_H
#include <unistd.h>
#endif
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo.c dia-0.97.2/plug-ins/cairo/diacairo.c
--- dia-0.97.2-orig/plug-ins/cairo/diacairo.c 2009-11-07 12:13:53.000000000 -0500
+++ dia-0.97.2/plug-ins/cairo/diacairo.c 2012-07-15 10:49:06.433726846 -0400
@@ -28,7 +28,7 @@
#include <errno.h>
#define G_LOG_DOMAIN "DiaCairo"
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
/*
* To me the following looks rather suspicious. Why do we need to compile
diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c dia-0.97.2/plug-ins/cairo/diacairo-renderer.c
--- dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c 2011-01-07 06:54:21.000000000 -0500
+++ dia-0.97.2/plug-ins/cairo/diacairo-renderer.c 2012-07-15 10:49:06.435726846 -0400
@@ -28,7 +28,7 @@
#include <errno.h>
#define G_LOG_DOMAIN "DiaCairo"
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#ifdef HAVE_PANGOCAIRO_H
#include <pango/pangocairo.h>
diff -Naur dia-0.97.2-orig/plug-ins/cgm/cgm.c dia-0.97.2/plug-ins/cgm/cgm.c
--- dia-0.97.2-orig/plug-ins/cgm/cgm.c 2009-12-27 11:22:38.000000000 -0500
+++ dia-0.97.2/plug-ins/cgm/cgm.c 2012-07-15 10:49:06.425726846 -0400
@@ -31,7 +31,7 @@
#include <glib.h>
#include <errno.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/drs/dia-render-script.c dia-0.97.2/plug-ins/drs/dia-render-script.c
--- dia-0.97.2-orig/plug-ins/drs/dia-render-script.c 2009-11-07 12:13:53.000000000 -0500
+++ dia-0.97.2/plug-ins/drs/dia-render-script.c 2012-07-15 10:49:06.427726848 -0400
@@ -54,7 +54,7 @@
#define G_LOG_DOMAIN "DiaRenderScript"
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "filter.h"
diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-export.c dia-0.97.2/plug-ins/dxf/dxf-export.c
--- dia-0.97.2-orig/plug-ins/dxf/dxf-export.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/plug-ins/dxf/dxf-export.c 2012-07-15 10:49:06.421726850 -0400
@@ -29,7 +29,7 @@
#include <math.h>
#include <glib.h>
#include <errno.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "autocad_pal.h"
diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-import.c dia-0.97.2/plug-ins/dxf/dxf-import.c
--- dia-0.97.2-orig/plug-ins/dxf/dxf-import.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/plug-ins/dxf/dxf-import.c 2012-07-15 10:49:06.419726851 -0400
@@ -30,7 +30,7 @@
#include <string.h>
#include <math.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/hpgl/hpgl.c dia-0.97.2/plug-ins/hpgl/hpgl.c
--- dia-0.97.2-orig/plug-ins/hpgl/hpgl.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/plug-ins/hpgl/hpgl.c 2012-07-15 10:49:06.487726830 -0400
@@ -37,7 +37,7 @@
#include <errno.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/libart/export_png.c dia-0.97.2/plug-ins/libart/export_png.c
--- dia-0.97.2-orig/plug-ins/libart/export_png.c 2011-07-03 06:56:08.000000000 -0400
+++ dia-0.97.2/plug-ins/libart/export_png.c 2012-07-15 10:49:06.415726849 -0400
@@ -29,7 +29,7 @@
#include <errno.h>
#include <stdlib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include "intl.h"
diff -Naur dia-0.97.2-orig/plug-ins/metapost/render_metapost.c dia-0.97.2/plug-ins/metapost/render_metapost.c
--- dia-0.97.2-orig/plug-ins/metapost/render_metapost.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/plug-ins/metapost/render_metapost.c 2012-07-15 10:49:06.396726857 -0400
@@ -43,7 +43,7 @@
#endif
#include <errno.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "render_metapost.h"
diff -Naur dia-0.97.2-orig/plug-ins/pgf/render_pgf.c dia-0.97.2/plug-ins/pgf/render_pgf.c
--- dia-0.97.2-orig/plug-ins/pgf/render_pgf.c 2011-01-07 07:11:34.000000000 -0500
+++ dia-0.97.2/plug-ins/pgf/render_pgf.c 2012-07-15 10:49:06.445726842 -0400
@@ -61,8 +61,8 @@
#endif
#include <errno.h>
-#include <glib/gprintf.h>
-#include <glib/gstdio.h>
+#include <glib.h>
+#include <glib.h>
#include "intl.h"
#include "render_pgf.h"
diff -Naur dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c dia-0.97.2/plug-ins/postscript/paginate_psprint.c
--- dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/plug-ins/postscript/paginate_psprint.c 2012-07-15 10:49:06.451726838 -0400
@@ -31,7 +31,7 @@
#include <errno.h>
#include <sys/stat.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/postscript/render_eps.c dia-0.97.2/plug-ins/postscript/render_eps.c
--- dia-0.97.2-orig/plug-ins/postscript/render_eps.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/plug-ins/postscript/render_eps.c 2012-07-15 10:49:06.451726838 -0400
@@ -55,7 +55,7 @@
#include <locale.h>
#include <errno.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "render_eps.h"
diff -Naur dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c dia-0.97.2/plug-ins/pstricks/render_pstricks.c
--- dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c 2011-01-07 07:11:34.000000000 -0500
+++ dia-0.97.2/plug-ins/pstricks/render_pstricks.c 2012-07-15 10:49:06.410726853 -0400
@@ -50,7 +50,7 @@
#endif
#include <errno.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "render_pstricks.h"
diff -Naur dia-0.97.2-orig/plug-ins/python/pydia-render.c dia-0.97.2/plug-ins/python/pydia-render.c
--- dia-0.97.2-orig/plug-ins/python/pydia-render.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/plug-ins/python/pydia-render.c 2012-07-15 10:49:06.503726822 -0400
@@ -21,7 +21,7 @@
#include <Python.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include <locale.h>
diff -Naur dia-0.97.2-orig/plug-ins/shape/shape-export.c dia-0.97.2/plug-ins/shape/shape-export.c
--- dia-0.97.2-orig/plug-ins/shape/shape-export.c 2009-11-08 06:14:56.000000000 -0500
+++ dia-0.97.2/plug-ins/shape/shape-export.c 2012-07-15 10:49:06.489726827 -0400
@@ -40,7 +40,7 @@
#include <unistd.h>
#endif
-#include <glib/gstdio.h>
+#include <glib.h>
/* the dots per centimetre to render this diagram at */
/* this matches the setting `100%' setting in dia. */
diff -Naur dia-0.97.2-orig/plug-ins/svg/render_svg.c dia-0.97.2/plug-ins/svg/render_svg.c
--- dia-0.97.2-orig/plug-ins/svg/render_svg.c 2011-12-17 11:30:38.000000000 -0500
+++ dia-0.97.2/plug-ins/svg/render_svg.c 2012-07-15 10:49:06.392726859 -0400
@@ -30,7 +30,7 @@
#endif
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include <libxml/entities.h>
#include <libxml/tree.h>
diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-export.c dia-0.97.2/plug-ins/vdx/vdx-export.c
--- dia-0.97.2-orig/plug-ins/vdx/vdx-export.c 2009-12-27 11:22:38.000000000 -0500
+++ dia-0.97.2/plug-ins/vdx/vdx-export.c 2012-07-15 10:55:17.066579728 -0400
@@ -32,11 +32,12 @@
#include <string.h>
#include <math.h>
+#include <sys/stat.h>
#include <glib.h>
#include <stdlib.h>
#include <errno.h>
#include <locale.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-import.c dia-0.97.2/plug-ins/vdx/vdx-import.c
--- dia-0.97.2-orig/plug-ins/vdx/vdx-import.c 2009-12-27 11:22:38.000000000 -0500
+++ dia-0.97.2/plug-ins/vdx/vdx-import.c 2012-07-15 10:49:06.466726836 -0400
@@ -28,7 +28,7 @@
#include <string.h>
#include <math.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include <stdlib.h>
#include <ctype.h>
#include <libxml/tree.h>
diff -Naur dia-0.97.2-orig/plug-ins/wmf/wmf.cpp dia-0.97.2/plug-ins/wmf/wmf.cpp
--- dia-0.97.2-orig/plug-ins/wmf/wmf.cpp 2011-03-13 09:07:48.000000000 -0400
+++ dia-0.97.2/plug-ins/wmf/wmf.cpp 2012-07-15 10:49:06.482726831 -0400
@@ -25,7 +25,7 @@
#include <string.h>
#include <math.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/wpg/wpg.c dia-0.97.2/plug-ins/wpg/wpg.c
--- dia-0.97.2-orig/plug-ins/wpg/wpg.c 2009-11-07 09:28:34.000000000 -0500
+++ dia-0.97.2/plug-ins/wpg/wpg.c 2012-07-15 10:49:06.406726855 -0400
@@ -40,7 +40,7 @@
#include <errno.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-export.c dia-0.97.2/plug-ins/xfig/xfig-export.c
--- dia-0.97.2-orig/plug-ins/xfig/xfig-export.c 2011-12-17 11:30:38.000000000 -0500
+++ dia-0.97.2/plug-ins/xfig/xfig-export.c 2012-07-15 10:49:06.400726856 -0400
@@ -16,7 +16,7 @@
#include <locale.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-import.c dia-0.97.2/plug-ins/xfig/xfig-import.c
--- dia-0.97.2-orig/plug-ins/xfig/xfig-import.c 2009-11-07 12:13:53.000000000 -0500
+++ dia-0.97.2/plug-ins/xfig/xfig-import.c 2012-07-15 10:49:06.402726853 -0400
@@ -40,7 +40,7 @@
#include <locale.h>
#include <glib.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "intl.h"
#include "message.h"
diff -Naur dia-0.97.2-orig/plug-ins/xslt/xslt.c dia-0.97.2/plug-ins/xslt/xslt.c
--- dia-0.97.2-orig/plug-ins/xslt/xslt.c 2009-11-07 12:13:53.000000000 -0500
+++ dia-0.97.2/plug-ins/xslt/xslt.c 2012-07-15 10:49:06.440726844 -0400
@@ -27,7 +27,7 @@
#include <string.h>
#include <errno.h>
-#include <glib/gstdio.h>
+#include <glib.h>
#include "filter.h"
#include "intl.h"
diff -Naur dia-0.97.2-orig/tests/test-boundingbox.c dia-0.97.2/tests/test-boundingbox.c
--- dia-0.97.2-orig/tests/test-boundingbox.c 2009-11-07 09:28:35.000000000 -0500
+++ dia-0.97.2/tests/test-boundingbox.c 2012-07-15 10:49:06.986726677 -0400
@@ -29,7 +29,7 @@
#include <glib-object.h>
#if GLIB_CHECK_VERSION(2,16,0)
-#include <glib/gtestutils.h>
+#include <glib.h>
#endif
#include "dialib.h"
diff -Naur dia-0.97.2-orig/tests/test-objects.c dia-0.97.2/tests/test-objects.c
--- dia-0.97.2-orig/tests/test-objects.c 2009-11-07 09:28:35.000000000 -0500
+++ dia-0.97.2/tests/test-objects.c 2012-07-15 10:49:06.985726677 -0400
@@ -29,7 +29,7 @@
#include <glib-object.h>
#if GLIB_CHECK_VERSION(2,16,0)
-#include <glib/gtestutils.h>
+#include <glib.h>
#endif
#include "object.h"

4
pkgs/applications/graphics/f-spot/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif { stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
, libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2 , libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
, monoDLLFixer , monoDLLFixer
, makeWrapper
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "f-spot-0.0.10"; name = "f-spot-0.0.10";
builder = ./builder.sh; builder = ./builder.sh;
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
inherit makeWrapper;
src = fetchurl { src = fetchurl {
url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2; url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2;

4
pkgs/applications/graphics/inkscape/default.nix
View File

@ -4,11 +4,11 @@
, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "inkscape-0.48.2"; name = "inkscape-0.48.3.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2"; sha256 = "126vfsafkfj6z65i5vp6g5dg9hvp3dd1zppjhms78257ns2zafq7";
}; };
patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ]; patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ];

1
pkgs/applications/misc/epdfview/default.nix
View File

@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll";
}; };
buildInputs = [ pkgconfig gtk poppler ]; buildInputs = [ pkgconfig gtk poppler ];
patches = [ ./glib-top-level-header.patch ];
meta = { meta = {
homepage = http://trac.emma-soft.com/epdfview/; homepage = http://trac.emma-soft.com/epdfview/;
description = "A lightweight PDF document viewer using Poppler and GTK+"; description = "A lightweight PDF document viewer using Poppler and GTK+";

12
pkgs/applications/misc/epdfview/glib-top-level-header.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur epdfview-0.1.8-orig/src/gtk/StockIcons.h epdfview-0.1.8/src/gtk/StockIcons.h
--- epdfview-0.1.8-orig/src/gtk/StockIcons.h 2011-05-28 06:24:57.000000000 -0400
+++ epdfview-0.1.8/src/gtk/StockIcons.h 2012-07-15 11:02:43.946339253 -0400
@@ -18,7 +18,7 @@
#if !defined (__STOCK_ICONS_H__)
#define __STOCK_ICONS_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS

5
pkgs/applications/misc/nut/default.nix
View File

@ -1,13 +1,14 @@
{stdenv, fetchurl, pkgconfig, neon, libusb, hal, openssl, udev}: { stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nut-2.6.1"; name = "nut-2.6.1";
src = fetchurl { src = fetchurl {
url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz; url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz;
sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00"; sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00";
}; };
buildInputs = [pkgconfig neon libusb hal openssl udev]; buildInputs = [ pkgconfig neon libusb openssl udev ];
configureFlags = [ configureFlags = [
"--with-all" "--with-all"

10
pkgs/applications/misc/xterm/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }: { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xterm-276"; name = "xterm-281";
src = fetchurl { src = fetchurl {
url = "ftp://invisible-island.net/xterm/${name}.tgz"; url = "ftp://invisible-island.net/xterm/${name}.tgz";
sha256 = "1k3k025z3vl91sc8i7f5lmnsb1rsblpbijri9vnxgpynw4wgrc7b"; sha256 = "1yrjjya7z5s3fi0iiaxgna35jh0ib2zx1yafyng35jma6qbwhxx7";
}; };
buildInputs = buildInputs =
[ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
ncurses freetype pkgconfig xorg.libXft xorg.luit ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit
]; ];
configureFlags = configureFlags =
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
''; '';
# Work around broken "plink.sh". # Work around broken "plink.sh".
NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11"; NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig";
# Hack to get xterm built with the feature of releasing a possible setgid of 'utmp', # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp',
# decided by the sysadmin to allow the xterm reporting to /var/run/utmp # decided by the sysadmin to allow the xterm reporting to /var/run/utmp

18
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM
libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: , libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psi-0.14"; name = "psi-0.14";
@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da"; sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da";
}; };
buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE buildInputs =
qca2 qca2_ossl pkgconfig which glib]; [ aspell qt4 zlib sox libX11 xproto libSM libICE
qca2 qca2_ossl pkgconfig which glib
];
NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
@ -23,6 +25,8 @@ stdenv.mkDerivation rec {
psiMedia = callPackage ./psimedia.nix { }; psiMedia = callPackage ./psimedia.nix { };
enableParallelBuilding = true;
postInstall = '' postInstall = ''
PSI_PLUGINS="$out/lib/psi/plugins" PSI_PLUGINS="$out/lib/psi/plugins"
mkdir -p "$PSI_PLUGINS" mkdir -p "$PSI_PLUGINS"
@ -34,9 +38,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Psi, an XMPP (Jabber) client"; description = "Psi, an XMPP (Jabber) client";
maintainers = with stdenv.lib.maintainers; maintainers = [ stdenv.lib.maintainers.raskin ];
[raskin]; platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms;
linux;
}; };
} }

54
pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch Normal file
View File

@ -0,0 +1,54 @@
http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch?view=log
Index: psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
===================================================================
--- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h
+++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
@@ -21,7 +21,7 @@
#ifndef GSTCUSTOMELEMENTS_H
#define GSTCUSTOMELEMENTS_H
-#include <glib/gthread.h>
+#include <glib.h>
#include <gst/gst.h>
#include <gst/base/gstpushsrc.h>
#include <gst/video/video.h>
Index: psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
===================================================================
--- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h
+++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
@@ -21,7 +21,7 @@
#ifndef PSI_GSTELEMENTS_H
#define PSI_GSTELEMENTS_H
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
Index: psimedia-1.0.3/gstprovider/gstthread.h
===================================================================
--- psimedia-1.0.3.orig/gstprovider/gstthread.h
+++ psimedia-1.0.3/gstprovider/gstthread.h
@@ -22,7 +22,7 @@
#define PSI_GSTTHREAD_H
#include <QThread>
-#include <glib/gmain.h>
+#include <glib.h>
namespace PsiMedia {
Index: psimedia-1.0.3/gstprovider/rwcontrol.h
===================================================================
--- psimedia-1.0.3.orig/gstprovider/rwcontrol.h
+++ psimedia-1.0.3/gstprovider/rwcontrol.h
@@ -28,7 +28,7 @@
#include <QMutex>
#include <QWaitCondition>
#include <QTimer>
-#include <glib/gmain.h>
+#include <glib.h>
#include "psimediaprovider.h"
#include "rtpworker.h"

8
pkgs/applications/networking/instant-messengers/psi/psimedia.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which { stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which
, glib, pkgconfig}: , glib, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "psimedia"; name = "psimedia";
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781"; sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
}; };
buildInputs = [qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig]; patches = [ ./glib-2.32.patch ];
buildInputs = [ qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig ];
configurePhase = ''./configure''; configurePhase = ''./configure'';

2
pkgs/applications/networking/irc/xchat/default.nix
View File

@ -9,6 +9,8 @@ stdenv.mkDerivation {
buildInputs = [pkgconfig tcl gtk]; buildInputs = [pkgconfig tcl gtk];
configureFlags = "--disable-nls"; configureFlags = "--disable-nls";
patches = [ ./glib-top-level-header.patch ];
meta = { meta = {
description = "IRC client using GTK"; description = "IRC client using GTK";
homepage = http://www.xchat.org; homepage = http://www.xchat.org;

75
pkgs/applications/networking/irc/xchat/glib-top-level-header.patch Normal file
View File

@ -0,0 +1,75 @@
diff -Naur xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c xchat-2.8.8/src/common/dbus/dbus-plugin.c
--- xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c 2009-08-16 05:40:15.000000000 -0400
+++ xchat-2.8.8/src/common/dbus/dbus-plugin.c 2012-07-15 23:07:33.678948703 -0400
@@ -24,7 +24,7 @@
#include <config.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include <glib/gi18n.h>
+#include <glib.h>
#include "../xchat-plugin.h"
#define PNAME _("remote access")
diff -Naur xchat-2.8.8-orig/src/common/modes.c xchat-2.8.8/src/common/modes.c
--- xchat-2.8.8-orig/src/common/modes.c 2010-05-29 21:52:18.000000000 -0400
+++ xchat-2.8.8/src/common/modes.c 2012-07-15 23:07:33.654948723 -0400
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <glib.h>
-#include <glib/gprintf.h>
+#include <glib.h>
#include "xchat.h"
#include "xchatc.h"
diff -Naur xchat-2.8.8-orig/src/common/servlist.c xchat-2.8.8/src/common/servlist.c
--- xchat-2.8.8-orig/src/common/servlist.c 2010-05-16 03:24:26.000000000 -0400
+++ xchat-2.8.8/src/common/servlist.c 2012-07-15 23:07:33.643948732 -0400
@@ -24,7 +24,7 @@
#include <unistd.h>
#include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
#include "cfgfiles.h"
#include "fe.h"
diff -Naur xchat-2.8.8-orig/src/common/text.c xchat-2.8.8/src/common/text.c
--- xchat-2.8.8-orig/src/common/text.c 2010-05-29 22:14:41.000000000 -0400
+++ xchat-2.8.8/src/common/text.c 2012-07-15 23:07:33.671948706 -0400
@@ -28,7 +28,7 @@
#include <sys/mman.h>
#include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
#include "cfgfiles.h"
#include "chanopt.h"
#include "plugin.h"
diff -Naur xchat-2.8.8-orig/src/common/util.c xchat-2.8.8/src/common/util.c
--- xchat-2.8.8-orig/src/common/util.c 2009-08-16 05:40:16.000000000 -0400
+++ xchat-2.8.8/src/common/util.c 2012-07-15 23:07:33.649948724 -0400
@@ -39,7 +39,7 @@
#include <errno.h>
#include "xchat.h"
#include "xchatc.h"
-#include <glib/gmarkup.h>
+#include <glib.h>
#include <ctype.h>
#include "util.h"
#include "../../config.h"
diff -Naur xchat-2.8.8-orig/src/common/xchat.h xchat-2.8.8/src/common/xchat.h
--- xchat-2.8.8-orig/src/common/xchat.h 2009-08-16 05:40:16.000000000 -0400
+++ xchat-2.8.8/src/common/xchat.h 2012-07-15 23:08:20.855910521 -0400
@@ -1,10 +1,6 @@
#include "../../config.h"
-#include <glib/gslist.h>
-#include <glib/glist.h>
-#include <glib/gutils.h>
-#include <glib/giochannel.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include <time.h> /* need time_t */
#ifndef XCHAT_H

28
pkgs/applications/networking/mailreaders/sylpheed/default.nix
View File

@ -5,25 +5,31 @@
, gpgme ? null , gpgme ? null
}: }:
with stdenv.lib;
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
assert gpgSupport -> gpgme != null; assert gpgSupport -> gpgme != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "sylpheed-2.7.1"; name = "sylpheed-3.2";
src = fetchurl { src = fetchurl {
url = http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-2.7.1.tar.bz2; url = http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2;
sha256 = "08sfz159y8hi3lky98m6p4nkfiima749lza8gf3s3vp2niylbdlb"; sha256 = "1cdjwn1f8rgcxzfxj7j7qvacmaw4zfhnip81q4n5lj5d6rj7rssa";
}; };
buildInputs = [ buildInputs =
pkgconfig gtk [ pkgconfig gtk ]
(if sslSupport then openssl else null) ++ optional sslSupport openssl
(if gpgSupport then gpgme else null) ++ optional gpgSupport gpgme;
];
configureFlags = [ configureFlags = optionalString sslSupport "--enable-ssl";
(if sslSupport then "--enable-ssl" else null)
];
meta = {
homepage = http://sylpheed.sraoss.jp/en/;
description = "A lightweight and user-friendly e-mail client";
maintainers = [ maintainers.eelco ];
platforms = platforms.linux;
license = "GPL";
};
} }

4
pkgs/applications/office/gnucash/default.nix
View File

@ -9,11 +9,11 @@
*/ */
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnucash-2.4.10"; name = "gnucash-2.4.11";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
sha256 = "1k76b6hnsmljggxsq5l9w94krfmhx58ij8jcxf72p0ddnlimdrjj"; sha256 = "0qbpgd6spclkmwryi66cih0igi5a6pmsnk41mmnscpfpz1mddhwk";
}; };
buildInputs = [ buildInputs = [

6
pkgs/applications/video/RealPlayer/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11}: {stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11, makeWrapper}:
# Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4. # Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4.
@ -13,9 +13,7 @@ assert stdenv.system == "i686-linux";
md5 = "d28b31261059231a3e93c7466f8153e6"; md5 = "d28b31261059231a3e93c7466f8153e6";
}; };
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; inherit libstdcpp5 makeWrapper;
inherit libstdcpp5;
libPath = [libstdcpp5 glib pango atk gtk libX11]; libPath = [libstdcpp5 glib pango atk gtk libX11];
}) // {mozillaPlugin = "/real/mozilla";} }) // {mozillaPlugin = "/real/mozilla";}

7
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -5,11 +5,14 @@ let version = "4.2.0"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}"; name = "VirtualBox-GuestAdditions-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3"; sha256 = "ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3";
}; };
KERN_DIR = "${kernel}/lib/modules/*/build"; KERN_DIR = "${kernel}/lib/modules/*/build";
buildInputs = [ patchelf cdrkit makeWrapper ]; buildInputs = [ patchelf cdrkit makeWrapper ];
installPhase = '' installPhase = ''
@ -101,9 +104,7 @@ stdenv.mkDerivation {
# Install Xorg drivers # Install Xorg drivers
mkdir -p $out/lib/xorg/modules/{drivers,input} mkdir -p $out/lib/xorg/modules/{drivers,input}
install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_112.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
# There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever?
#install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so
# Install kernel modules # Install kernel modules
cd src cd src

1
pkgs/applications/window-managers/awesome/default.nix
View File

@ -48,3 +48,4 @@ stdenv.mkDerivation rec {
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }

2
pkgs/applications/window-managers/icewm/default.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na"; sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na";
}; };
patches = [ ./deprecated.patch ];
NIX_LDFLAGS = "-lfontconfig"; NIX_LDFLAGS = "-lfontconfig";
# The fuloong2f is not supported by 1.3.6 still # The fuloong2f is not supported by 1.3.6 still

23
pkgs/applications/window-managers/icewm/deprecated.patch Normal file
View File

@ -0,0 +1,23 @@
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch?revision=1.1
Description: Don't use "deprecated" as identifier, will FTBFS if another
library defines functions as deprecated.
Author: Andreas Moog <amoog@ubuntu.com>
Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
Forwarded: Yes
--- icewm-1.3.7.orig/src/base.h
+++ icewm-1.3.7/src/base.h
@@ -2,9 +2,9 @@
#define __BASE_H
#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
-#define deprecated __attribute__((deprecated))
+#define ICEWM_deprecated __attribute__((deprecated))
#else
-#define deprecated
+#define ICEWM_deprecated
#endif
/*** Atomar Data Types ********************************************************/

11
pkgs/build-support/setup-hooks/autoreconf.sh Normal file
View File

@ -0,0 +1,11 @@
preConfigurePhases+=" autoreconfPhase"
for i in @autoconf@ @automake@ @libtool@; do
findInputs $i nativePkgs propagated-build-native-inputs
done
autoreconfPhase() {
runHook preAutoreconf
autoreconf ${autoreconfFlags:---install --force}
runHook postAutoreconf
}

0
pkgs/build-support/make-wrapper/make-wrapper.sh → pkgs/build-support/setup-hooks/make-wrapper.sh
View File

6
pkgs/data/misc/xkeyboard-config/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }: { stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xkeyboard-config-2.1"; name = "xkeyboard-config-2.7";
src = fetchurl { src = fetchurl {
url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2"; url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
sha256 = "0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr"; sha256 = "08c3mjdgp7c2v6lj5bymaczcazklsd7s1lxslxbngzmh5yhphd74";
}; };
buildInputs = [ gettext ]; buildInputs = [ gettext ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patches = [ ./eo.patch ]; patches = [ ./eo.patch ];
preConfigure = '' preConfigure = ''
configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86" configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86 --disable-runtime-deps"
sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
''; '';

14
pkgs/desktops/gnome-2/desktop/gvfs/default.nix
View File

@ -1,19 +1,21 @@
{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2 { stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2
, libcdio, libxml2, libtool, glib, intltool, GConf, libgnome_keyring, libsoup , libcdio, libxml2, libtool, glib, intltool, GConf, libgnome_keyring, libsoup
, udev, avahi}: , udev, avahi, libxslt, docbook_xsl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gvfs-1.10.1"; name = "gvfs-1.14.1";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gvfs/1.10/gvfs-1.10.1.tar.xz; url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
sha256 = "124jrkph3cqr2pijmzzr6qwzy2vaq3vvndskzkxd0v5dwp7glc6d"; sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a";
}; };
buildInputs = buildInputs =
[ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 GConf [ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 GConf
libgnome_keyring libsoup avahi libtool libgnome_keyring libsoup avahi libtool libxslt docbook_xsl
]; ];
buildNativeInputs = [ pkgconfig intltool ]; buildNativeInputs = [ pkgconfig intltool ];
enableParallelBuilding = true;
} }

10
pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
View File

@ -1,16 +1,16 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: { stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }:
let stdenv.mkDerivation rec {
name = "libgnomecups-0.2.3"; name = "libgnomecups-0.2.3";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2"; url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2";
sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71";
}; };
patches = [ ./glib.patch ];
buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];
} }

38
pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch Normal file
View File

@ -0,0 +1,38 @@
From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sun, 27 Nov 2011 21:36:41 +0100
Subject: [PATCH] Fix: Only glib.h can be included
---
libgnomecups/gnome-cups-i18n.c | 2 +-
libgnomecups/gnome-cups-init.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
index 8987c5c..127756d 100644
--- a/libgnomecups/gnome-cups-i18n.c
+++ b/libgnomecups/gnome-cups-i18n.c
@@ -1,5 +1,5 @@
#include <config.h>
-#include <glib/gmacros.h>
+#include <glib.h>
#include "gnome-cups-i18n.h"
#ifdef ENABLE_NLS
diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
index 22b682a..c4600fc 100644
--- a/libgnomecups/gnome-cups-init.h
+++ b/libgnomecups/gnome-cups-init.h
@@ -1,8 +1,7 @@
#ifndef GNOME_CUPS_INIT
#define GNOME_CUPS_INIT
-#include <glib/gtypes.h>
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
--
1.7.7

10
pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
View File

@ -1,11 +1,8 @@
{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison, { stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl
flex }: , libgnomecups, bison, flex }:
let stdenv.mkDerivation rec {
name = "libgnomeprint-2.18.8"; name = "libgnomeprint-2.18.8";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2"; url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2";
@ -15,5 +12,6 @@ stdenv.mkDerivation {
patches = [ ./bug653388.patch ]; patches = [ ./bug653388.patch ];
buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ];
propagatedBuildInputs = [ libxml2 ]; propagatedBuildInputs = [ libxml2 ];
} }

14
pkgs/desktops/xfce-4.8/support/gvfs.nix
View File

@ -1,14 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse }: { stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse
, libxml2, libxslt, docbook_xsl, libgphoto2, libtool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gvfs-1.8.2"; name = "gvfs-1.14.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gvfs/1.8/${name}.tar.bz2"; url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"; sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a";
}; };
buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu fuse ]; buildInputs =
[ pkgconfig glib dbus.libs intltool udev libgdu fuse libxml2 libxslt
docbook_xsl libgphoto2 libtool
];
meta = { meta = {
description = "Virtual Filesystem support library (for Xfce)"; description = "Virtual Filesystem support library (for Xfce)";

172
pkgs/development/interpreters/php/5.2.nix
View File

@ -1,172 +0,0 @@
args: with args;
let
inherit (args.composableDerivation) composableDerivation edf wwf;
in
composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "5.2.17";
name = "php-${version}";
buildInputs = ["flex" "bison" "pkgconfig"];
flags = {
# much left to do here...
# SAPI modules:
apxs2 = {
configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
buildInputs = [apacheHttpd];
};
# Extensions
curl = {
configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
buildInputs = [curl openssl];
};
zlib = {
configureFlags = ["--with-zlib=${args.zlib}"];
buildInputs = [zlib];
};
libxml2 = {
configureFlags = [
"--with-libxml-dir=${libxml2}"
"--with-iconv-dir=${libiconv}"
];
buildInputs = [ libxml2 ];
};
readline = {
configureFlags = ["--with-readline=${readline}"];
buildInputs = [ readline ];
};
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
buildInputs = [ sqlite ];
};
postgresql = {
configureFlags = ["--with-pgsql=${postgresql}"];
buildInputs = [ postgresql ];
};
mysql = {
configureFlags = ["--with-mysql=${mysql}"];
buildInputs = [ mysql ];
};
mysqli = {
configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
buildInputs = [ mysql];
};
mysqli_embedded = {
configureFlags = ["--enable-embedded-mysqli"];
depends = "mysqli";
assertion = fixed.mysqliSupport;
};
pdo_mysql = {
configureFlags = ["--with-pdo-mysql=${mysql}"];
buildInputs = [ mysql ];
};
bcmath = {
configureFlags = ["--enable-bcmath"];
};
gd = {
configureFlags = ["--with-gd=${args.gd}"];
buildInputs = [gd libpng libjpeg ];
};
soap = {
configureFlags = ["--enable-soap"];
};
sockets = {
configureFlags = ["--enable-sockets"];
};
openssl = {
configureFlags = ["--with-openssl=${args.openssl}"];
buildInputs = ["openssl"];
};
mbstring = {
configureFlags = ["--enable-mbstring"];
};
/*
php is build within this derivation in order to add the xdebug lines to the php.ini.
So both Apache and command line php both use xdebug without having to configure anything.
Xdebug could be put in its own derivation.
* /
meta = {
description = "debugging support for PHP";
homepage = http://xdebug.org;
license = "based on the PHP license - as is";
};
*/
};
cfg = {
mysqlSupport = config.php.mysql or true;
mysqliSupport = config.php.mysqli or true;
pdo_mysqlSupport = config.php.pdo_mysql or true;
libxml2Support = config.php.libxml2 or true;
apxs2Support = config.php.apxs2 or true;
bcmathSupport = config.php.bcmath or true;
socketsSupport = config.php.sockets or true;
curlSupport = config.php.curl or true;
gettextSupport = config.php.gettext or true;
postgresqlSupport = config.php.postgresql or true;
readlineSupport = config.php.readline or true;
sqliteSupport = config.php.sqlite or true;
soapSupport = config.php.soap or true;
zlibSupport = config.php.zlib or true;
opensslSupport = config.php.openssl or true;
mbstringSupport = config.php.mbstring or true;
gdSupport = config.php.gd or true;
};
configurePhase = ''
iniFile=$out/etc/php-recommended.ini
[[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
echo configurePhase end
'';
installPhase = ''
unset installPhase; installPhase;
cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
then "recommended" /* < PHP 5.3 */
else "production" /* >= PHP 5.3 */
} $iniFile
'';
src = args.fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
sha256 = "0v0i7zjp1a2c60imn58xjqcczmiglnfnwdkgwl0bfai4xh9yn6z8";
name = "php-${version}.tar.bz2";
};
meta = {
description = "The PHP language runtime engine";
homepage = http://www.php.net/;
license = "PHP-3";
};
patches = [./fix.patch];
})

30
pkgs/development/interpreters/php/5.3.nix
View File

@ -1,22 +1,20 @@
args: with args; { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql
, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng }:
let composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
inherit (args.composableDerivation) composableDerivation edf wwf; version = "5.3.17";
in
composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "5.3.15";
name = "php-${version}"; name = "php-${version}";
enableParallelBuilding = true;
buildInputs = ["flex" "bison" "pkgconfig"]; buildInputs = ["flex" "bison" "pkgconfig"];
flags = { flags = {
# much left to do here... # much left to do here...
# SAPI modules: # SAPI modules:
@ -28,12 +26,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
# Extensions # Extensions
curl = { curl = {
configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"]; configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"];
buildInputs = [curl openssl]; buildInputs = [curl openssl];
}; };
zlib = { zlib = {
configureFlags = ["--with-zlib=${args.zlib}"]; configureFlags = ["--with-zlib=${zlib}"];
buildInputs = [zlib]; buildInputs = [zlib];
}; };
@ -86,7 +84,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
}; };
gd = { gd = {
configureFlags = ["--with-gd=${args.gd}"]; configureFlags = ["--with-gd=${gd}"];
buildInputs = [gd libpng libjpeg ]; buildInputs = [gd libpng libjpeg ];
}; };
@ -99,7 +97,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
}; };
openssl = { openssl = {
configureFlags = ["--with-openssl=${args.openssl}"]; configureFlags = ["--with-openssl=${openssl}"];
buildInputs = ["openssl"]; buildInputs = ["openssl"];
}; };
@ -152,9 +150,9 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
cp php.ini-production $iniFile cp php.ini-production $iniFile
''; '';
src = args.fetchurl { src = fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
sha256 = "1vzij845n2akh2lkpacgdc5r0f7nw6pk9l9vi1h8l8k4krjjbdzr"; sha256 = "02bmjlznnfhxhyd4wvk8ky9vpqwl9rbyng803r7ygf84sibyi1dd";
name = "php-${version}.tar.bz2"; name = "php-${version}.tar.bz2";
}; };

6
pkgs/development/libraries/atk/2.2.x.nix → pkgs/development/libraries/atk/2.6.x.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }: { stdenv, fetchurl, pkgconfig, perl, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atk-2.2.0"; name = "atk-2.6.0";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz; url = "mirror://gnome/sources/atk/2.6/${name}.tar.xz";
sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f";
}; };
buildNativeInputs = [ pkgconfig perl ]; buildNativeInputs = [ pkgconfig perl ];

8
pkgs/development/libraries/cairo/default.nix
View File

@ -13,11 +13,11 @@ assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null; assert xcbSupport -> libxcb != null && xcbutil != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cairo-1.10.2"; name = "cairo-1.12.4";
src = fetchurl { src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz"; url = "http://cairographics.org/releases/${name}.tar.xz";
sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e"; sha1 = "f4158981ed01e73c94fb8072074b17feee61a68b";
}; };
buildInputs = buildInputs =
@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
''; '';
enableParallelBuilding = true;
# The default `--disable-gtk-doc' is ignored. # The default `--disable-gtk-doc' is ignored.
postInstall = "rm -rf $out/share/gtk-doc"; postInstall = "rm -rf $out/share/gtk-doc";

10
pkgs/development/libraries/dbus/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
let let
version = "1.4.16"; version = "1.6.4";
src = fetchurl { src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "1ii93d0lzj5xm564dcq6ca4s0nvm5i9fx3jp0s7i9hlc5wkfd3hx"; sha256 = "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz";
}; };
patches = [ ./ignore-missing-includedirs.patch ]; patches = [ ./ignore-missing-includedirs.patch ];
@ -21,6 +21,10 @@ in rec {
buildInputs = [ expat ]; buildInputs = [ expat ];
# FIXME: dbus has optional systemd integration when checking
# at_console policies. How to enable this without introducing a
# circular dependency between dbus and systemd?
inherit src patches configureFlags; inherit src patches configureFlags;
preConfigure = preConfigure =
@ -58,6 +62,8 @@ in rec {
''; '';
postConfigure = "cd tools"; postConfigure = "cd tools";
installFlags = "localstatedir=$TMPDIR/var";
}; };
# I'm too lazy to separate daemon and libs now. # I'm too lazy to separate daemon and libs now.

18
pkgs/development/libraries/expat/cve-2009-3560.patch
View File

@ -1,18 +0,0 @@
From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch?revision=1.1
http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
http://bugs.gentoo.org/show_bug.cgi?id=303727
http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/
--- a/lib/xmlparse.c
+++ b/lib/xmlparse.c
@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
return XML_ERROR_UNCLOSED_TOKEN;
case XML_TOK_PARTIAL_CHAR:
return XML_ERROR_PARTIAL_CHAR;
+ case -XML_TOK_PROLOG_S:
+ tok = -tok;
+ break;
case XML_TOK_NONE:
#ifdef XML_DTD
/* for internal PE NOT referenced between declarations */

12
pkgs/development/libraries/expat/default.nix
View File

@ -1,17 +1,15 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "expat-2.0.1"; name = "expat-2.1.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/expat/expat-2.0.1.tar.gz; url = "mirror://sourceforge/expat/${name}.tar.gz";
sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4"; sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
}; };
patches = [ ./cve-2009-3560.patch ];
meta = { meta = {
homepage = http://expat.sourceforge.net/; homepage = http://www.libexpat.org/;
description = "A stream-oriented XML parser library written in C"; description = "A stream-oriented XML parser library written in C";
}; };
} }

15
pkgs/development/libraries/fontconfig/default.nix
View File

@ -1,22 +1,21 @@
{ stdenv, fetchurl, freetype, expat }: { stdenv, fetchurl, pkgconfig, freetype, expat }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fontconfig-2.8.0"; name = "fontconfig-2.10.1";
src = fetchurl { src = fetchurl {
url = "http://fontconfig.org/release/${name}.tar.gz"; url = "http://fontconfig.org/release/${name}.tar.gz";
sha256 = "0d9370qnn1qzq0jidbycin2frkcr1kqj04jbgb79ykb5x9p1qaps"; sha256 = "08h252crb3aqciwdk81jypmz2i7618dzqn3zlr87w1f017wjp4f3";
}; };
buildInputs = [ freetype ]; buildInputs = [ pkgconfig freetype ];
propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks
configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
# We should find a better way to access the arch reliably. # We should find a better way to access the arch reliably.
crossArch = if (stdenv ? cross && stdenv.cross != null) crossArch = stdenv.cross.arch or null;
then stdenv.cross.arch else null;
preConfigure = '' preConfigure = ''
if test -n "$crossConfig"; then if test -n "$crossConfig"; then
@ -24,6 +23,8 @@ stdenv.mkDerivation rec {
fi fi
''; '';
enableParallelBuilding = true;
# Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time.
installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy";

23
pkgs/development/libraries/freetype/default.nix
View File

@ -5,12 +5,12 @@
useEncumberedCode ? false useEncumberedCode ? false
}: }:
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "freetype-2.4.4"; name = "freetype-2.4.10";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/freetype/${name}.tar.bz2"; url = "mirror://sourceforge/freetype/${name}.tar.bz2";
sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb"; sha256 = "0bwrkqpygayfc1rf6rr1nb8l3svgn1fmjz8davg2hnf46cn293hc";
}; };
configureFlags = "--disable-static"; configureFlags = "--disable-static";
@ -21,16 +21,19 @@ stdenv.mkDerivation (rec {
# The asm for armel is written with the 'asm' keyword. # The asm for armel is written with the 'asm' keyword.
CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99"; CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";
# FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
buildInputs = stdenv.lib.optional (stdenv.system == "i686-freebsd") gnumake;
enableParallelBuilding = true;
postInstall =
''
ln -s freetype2/freetype $out/include/freetype
'';
meta = { meta = {
description = "A font rendering engine"; description = "A font rendering engine";
homepage = http://www.freetype.org/; homepage = http://www.freetype.org/;
license = "GPLv2+"; # or the FreeType License (BSD + advertising clause) license = "GPLv2+"; # or the FreeType License (BSD + advertising clause)
}; };
} }
//
# FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
(if stdenv.system == "i686-freebsd"
then { buildInputs = [ gnumake ]; }
else {}))

2
pkgs/development/libraries/gamin/debian-patches.nix
View File

@ -1,6 +1,6 @@
# Generated by debian-patches.sh from debian-patches.txt # Generated by debian-patches.sh from debian-patches.txt
let let
prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4"; prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4.1";
in in
[ [
{ {

11
pkgs/development/libraries/gdk-pixbuf/2.24.x.nix → pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
View File

@ -1,12 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz { stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }:
, jasper }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.24.1"; name = "gdk-pixbuf-2.26.1";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz; url = "mirror://gnome/sources/gdk-pixbuf/2.26/${name}.tar.xz";
sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns"; sha256 = "a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba";
}; };
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage. # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.

15
pkgs/development/libraries/glib/2.30.x.nix → pkgs/development/libraries/glib/2.34.x.nix
View File

@ -12,25 +12,24 @@
# $out/bin/gtester-report' to postInstall if this is solved # $out/bin/gtester-report' to postInstall if this is solved
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glib-2.30.3"; name = "glib-2.34.0";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz; url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz";
sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6"; sha256 = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144";
}; };
# configure script looks for d-bus but it is only needed for tests # configure script looks for d-bus but it is only needed for tests
buildInputs = [ pcre ] buildInputs = [ libiconvOrNull ];
++ (if libiconvOrNull != null
then [ libiconvOrNull ]
else []);
buildNativeInputs = [ perl pkgconfig gettext python ]; buildNativeInputs = [ perl pkgconfig gettext python ];
propagatedBuildInputs = [ zlib libffi ]; propagatedBuildInputs = [ pcre zlib libffi ];
configureFlags = "--with-pcre=system --disable-fam"; configureFlags = "--with-pcre=system --disable-fam";
enableParallelBuilding = true;
passthru.gioModuleDir = "lib/gio/modules"; passthru.gioModuleDir = "lib/gio/modules";
postInstall = ''rm -rvf $out/share/gtk-doc''; postInstall = ''rm -rvf $out/share/gtk-doc'';

11
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -1,12 +1,7 @@
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }: { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }:
let
baseName = "gobject-introspection";
v = "0.10.8";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${baseName}-${v}"; name = "gobject-introspection-1.34.0";
buildInputs = [ flex bison glib pkgconfig python ]; buildInputs = [ flex bison glib pkgconfig python ];
propagatedBuildInputs = [ libffi ]; propagatedBuildInputs = [ libffi ];
@ -16,8 +11,8 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-tests"; configureFlags = "--disable-tests";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${baseName}/0.10/${name}.tar.bz2"; url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz";
sha256 = "5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e"; sha256 = "80e211ea95404fc7c5fa3b04ba69ee0b29af70847af315155ab06b8cff832c85";
}; };
postInstall = "rm -rf $out/share/gtk-doc"; postInstall = "rm -rf $out/share/gtk-doc";

17
pkgs/development/libraries/goffice/default.nix
View File

@ -1,19 +1,18 @@
{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 { fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
, pango, libgsf, libxml2, libart, intltool, gettext , pango, libgsf, libxml2, libart, intltool, gettext
, cairo, gconf, libgnomeui }: , cairo, gconf, libgnomeui, pcre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "goffice-0.6.6"; name = "goffice-0.8.17";
src = fetchurl { src = fetchurl {
# An old version, but one that's actually usable for Gnucash. url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
url = "mirror://gnome/sources/goffice/0.6/${name}.tar.bz2"; sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
sha256 = "11lzhmk7g6mdsbyn4p4a6q2d9m8j71vad2haw6pmzyjzv2gs4rq7";
}; };
buildInputs = [ buildInputs = [
pkgconfig libglade bzip2 libart intltool gettext pkgconfig libglade bzip2 libart intltool gettext
gconf libgnomeui gconf libgnomeui pcre
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -21,6 +20,12 @@ stdenv.mkDerivation rec {
glib libgsf libxml2 gtk libglade libart cairo pango glib libgsf libxml2 gtk libglade libart cairo pango
]; ];
postInstall =
''
# Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig.
substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
'';
doCheck = true; doCheck = true;
meta = { meta = {

9
pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
View File

@ -8,14 +8,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gst-plugins-base-0.10.35"; name = "gst-plugins-base-0.10.36";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2" "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"
"mirror://gentoo/distfiles/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.xz"
]; ];
sha256 = "00vis5kg6km26zaq1ywz7ki9xvkwpc9c5wn41d01z2i5nldz096d"; sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z";
}; };
patchPhase = '' patchPhase = ''
@ -43,3 +43,4 @@ stdenv.mkDerivation rec {
license = "LGPLv2+"; license = "LGPLv2+";
}; };
} }

8
pkgs/development/libraries/gstreamer/gstreamer/default.nix
View File

@ -1,14 +1,14 @@
{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }: { fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gstreamer-0.10.35"; name = "gstreamer-0.10.36";
src = fetchurl { src = fetchurl {
urls = urls =
[ "${meta.homepage}/src/gstreamer/${name}.tar.bz2" [ "${meta.homepage}/src/gstreamer/${name}.tar.xz"
"mirror://gentoo/distfiles/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.xz"
]; ];
sha256 = "11lp13lig3c6qys80phyvsik56r9y0c95vg2jxxliqj6rnigwyw1"; sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci";
}; };
buildInputs = [ perl bison flex pkgconfig ]; buildInputs = [ perl bison flex pkgconfig ];

14
pkgs/development/libraries/gtk+/2.24.x.nix
View File

@ -7,20 +7,14 @@
assert xineramaSupport -> xlibs.libXinerama != null; assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gtk+-2.24.10"; name = "gtk+-2.24.13";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gtk+/2.24/gtk+-2.24.10.tar.xz; url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
sha256 = "128fb8vmsqmfmpf1r8na65281jwkqix4q7wix399xqfnp4dy6mpa"; sha256 = "35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d";
}; };
patches =
[ # Fix broken icons such as the back/forward buttons in Firefox.
# http://bugs.gentoo.org/339319
./old-icons.patch
];
enableParallelBuilding = true; enableParallelBuilding = true;
buildNativeInputs = [ perl pkgconfig ]; buildNativeInputs = [ perl pkgconfig ];

6
pkgs/development/libraries/gtk+/3.2.x.nix
View File

@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtk+-3.2.3"; name = "gtk+-3.2.4";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz; url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz";
sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2"; sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

270
pkgs/development/libraries/gtk+/old-icons.patch
View File

@ -1,270 +0,0 @@
diff -ru gtk+-2.24.5-orig/gtk/Makefile.in gtk+-2.24.5/gtk/Makefile.in
--- gtk+-2.24.5-orig/gtk/Makefile.in 2011-06-16 01:56:37.000000000 +0200
+++ gtk+-2.24.5/gtk/Makefile.in 2011-07-07 15:38:06.000000000 +0200
@@ -1616,7 +1616,173 @@
stock-icons/24/folder-remote.png \
stock-icons/24/user-home.png \
stock-icons/24/user-desktop.png \
- stock-icons/24/text-x-generic.png
+ stock-icons/24/text-x-generic.png \
+ stock-icons/16/gtk-quit.png \
+ stock-icons/16/gtk-info.png \
+ stock-icons/16/gtk-file.png \
+ stock-icons/16/gtk-open.png \
+ stock-icons/16/gtk-print-preview.png \
+ stock-icons/16/gtk-print.png \
+ stock-icons/16/gtk-properties.png \
+ stock-icons/16/gtk-revert-to-saved-ltr.png \
+ stock-icons/16/gtk-revert-to-saved-rtl.png \
+ stock-icons/16/gtk-save-as.png \
+ stock-icons/16/gtk-new.png \
+ stock-icons/16/gtk-harddisk.png \
+ stock-icons/16/gtk-clear.png \
+ stock-icons/16/gtk-copy.png \
+ stock-icons/16/gtk-cut.png \
+ stock-icons/16/gtk-delete.png \
+ stock-icons/16/gtk-find-and-replace.png \
+ stock-icons/16/gtk-find.png \
+ stock-icons/16/gtk-paste.png \
+ stock-icons/16/gtk-redo-ltr.png \
+ stock-icons/16/gtk-redo-rtl.png \
+ stock-icons/16/gtk-select-all.png \
+ stock-icons/16/gtk-undo-ltr.png \
+ stock-icons/16/gtk-undo-rtl.png \
+ stock-icons/16/gtk-directory.png \
+ stock-icons/16/gtk-unindent-ltr.png \
+ stock-icons/16/gtk-unindent-rtl.png \
+ stock-icons/16/gtk-indent-ltr.png \
+ stock-icons/16/gtk-indent-rtl.png \
+ stock-icons/16/gtk-justify-center.png \
+ stock-icons/16/gtk-justify-fill.png \
+ stock-icons/16/gtk-justify-left.png \
+ stock-icons/16/gtk-justify-right.png \
+ stock-icons/16/gtk-bold.png \
+ stock-icons/16/gtk-italic.png \
+ stock-icons/16/gtk-strikethrough.png \
+ stock-icons/16/gtk-underline.png \
+ stock-icons/16/gtk-goto-bottom.png \
+ stock-icons/16/gtk-go-down.png \
+ stock-icons/16/gtk-goto-first-ltr.png \
+ stock-icons/16/gtk-home.png \
+ stock-icons/16/gtk-jump-to-ltr.png \
+ stock-icons/16/gtk-jump-to-rtl.png \
+ stock-icons/16/gtk-goto-last-ltr.png \
+ stock-icons/16/gtk-go-forward-ltr.png \
+ stock-icons/16/gtk-go-back-ltr.png \
+ stock-icons/16/gtk-goto-top.png \
+ stock-icons/16/gtk-go-up.png \
+ stock-icons/16/gtk-about.png \
+ stock-icons/16/gtk-help.png \
+ stock-icons/16/gtk-missing-image.png \
+ stock-icons/16/gtk-add.png \
+ stock-icons/16/gtk-remove.png \
+ stock-icons/16/gtk-floppy.png \
+ stock-icons/16/gtk-cdrom.png \
+ stock-icons/16/gtk-media-pause.png \
+ stock-icons/16/gtk-media-play-ltr.png \
+ stock-icons/16/gtk-media-play-rtl.png \
+ stock-icons/16/gtk-media-stop.png \
+ stock-icons/16/gtk-media-record.png \
+ stock-icons/16/gtk-media-rewind-ltr.png \
+ stock-icons/16/gtk-media-forward-ltr.png \
+ stock-icons/16/gtk-media-previous-ltr.png \
+ stock-icons/16/gtk-media-next-ltr.png \
+ stock-icons/16/gtk-network.png \
+ stock-icons/16/gtk-print-error.png \
+ stock-icons/16/gtk-print-report.png \
+ stock-icons/16/gtk-print-paused.png \
+ stock-icons/16/gtk-print-warning.png \
+ stock-icons/16/gtk-stop.png \
+ stock-icons/16/gtk-execute.png \
+ stock-icons/16/gtk-spell-check.png \
+ stock-icons/16/gtk-fullscreen.png \
+ stock-icons/16/gtk-refresh.png \
+ stock-icons/16/gtk-leave-fullscreen.png \
+ stock-icons/16/gtk-sort-ascending.png \
+ stock-icons/16/gtk-sort-descending.png \
+ stock-icons/16/gtk-close.png \
+ stock-icons/16/gtk-zoom-fit.png \
+ stock-icons/16/gtk-zoom-in.png \
+ stock-icons/16/gtk-zoom-100.png \
+ stock-icons/16/gtk-zoom-out.png \
+ stock-icons/24/gtk-quit.png \
+ stock-icons/24/gtk-info.png \
+ stock-icons/24/gtk-file.png \
+ stock-icons/24/gtk-open.png \
+ stock-icons/24/gtk-print-preview.png \
+ stock-icons/24/gtk-print.png \
+ stock-icons/24/gtk-properties.png \
+ stock-icons/24/gtk-revert-to-saved-ltr.png \
+ stock-icons/24/gtk-revert-to-saved-rtl.png \
+ stock-icons/24/gtk-save-as.png \
+ stock-icons/24/gtk-new.png \
+ stock-icons/24/gtk-harddisk.png \
+ stock-icons/24/gtk-clear.png \
+ stock-icons/24/gtk-copy.png \
+ stock-icons/24/gtk-cut.png \
+ stock-icons/24/gtk-delete.png \
+ stock-icons/24/gtk-find-and-replace.png \
+ stock-icons/24/gtk-find.png \
+ stock-icons/24/gtk-paste.png \
+ stock-icons/24/gtk-redo-ltr.png \
+ stock-icons/24/gtk-redo-rtl.png \
+ stock-icons/24/gtk-select-all.png \
+ stock-icons/24/gtk-undo-ltr.png \
+ stock-icons/24/gtk-undo-rtl.png \
+ stock-icons/24/gtk-directory.png \
+ stock-icons/24/gtk-unindent-ltr.png \
+ stock-icons/24/gtk-unindent-rtl.png \
+ stock-icons/24/gtk-indent-ltr.png \
+ stock-icons/24/gtk-indent-rtl.png \
+ stock-icons/24/gtk-justify-center.png \
+ stock-icons/24/gtk-justify-fill.png \
+ stock-icons/24/gtk-justify-left.png \
+ stock-icons/24/gtk-justify-right.png \
+ stock-icons/24/gtk-bold.png \
+ stock-icons/24/gtk-italic.png \
+ stock-icons/24/gtk-strikethrough.png \
+ stock-icons/24/gtk-underline.png \
+ stock-icons/24/gtk-goto-bottom.png \
+ stock-icons/24/gtk-go-down.png \
+ stock-icons/24/gtk-goto-first-ltr.png \
+ stock-icons/24/gtk-home.png \
+ stock-icons/24/gtk-jump-to-ltr.png \
+ stock-icons/24/gtk-jump-to-rtl.png \
+ stock-icons/24/gtk-goto-last-ltr.png \
+ stock-icons/24/gtk-go-forward-ltr.png \
+ stock-icons/24/gtk-go-back-ltr.png \
+ stock-icons/24/gtk-goto-top.png \
+ stock-icons/24/gtk-go-up.png \
+ stock-icons/24/gtk-about.png \
+ stock-icons/24/gtk-help.png \
+ stock-icons/24/gtk-missing-image.png \
+ stock-icons/24/gtk-add.png \
+ stock-icons/24/gtk-remove.png \
+ stock-icons/24/gtk-floppy.png \
+ stock-icons/24/gtk-cdrom.png \
+ stock-icons/24/gtk-media-pause.png \
+ stock-icons/24/gtk-media-play-ltr.png \
+ stock-icons/24/gtk-media-play-rtl.png \
+ stock-icons/24/gtk-media-stop.png \
+ stock-icons/24/gtk-media-record.png \
+ stock-icons/24/gtk-media-rewind-ltr.png \
+ stock-icons/24/gtk-media-forward-ltr.png \
+ stock-icons/24/gtk-media-previous-ltr.png \
+ stock-icons/24/gtk-media-next-ltr.png \
+ stock-icons/24/gtk-network.png \
+ stock-icons/24/gtk-print-error.png \
+ stock-icons/24/gtk-print-report.png \
+ stock-icons/24/gtk-print-paused.png \
+ stock-icons/24/gtk-print-warning.png \
+ stock-icons/24/gtk-stop.png \
+ stock-icons/24/gtk-execute.png \
+ stock-icons/24/gtk-spell-check.png \
+ stock-icons/24/gtk-fullscreen.png \
+ stock-icons/24/gtk-refresh.png \
+ stock-icons/24/gtk-leave-fullscreen.png \
+ stock-icons/24/gtk-sort-ascending.png \
+ stock-icons/24/gtk-sort-descending.png \
+ stock-icons/24/gtk-close.png \
+ stock-icons/24/gtk-zoom-fit.png \
+ stock-icons/24/gtk-zoom-in.png \
+ stock-icons/24/gtk-zoom-100.png \
+ stock-icons/24/gtk-zoom-out.png \
+ stock-icons/48/gtk-dialog-error.png
+
@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
@@ -2887,7 +3053,91 @@
&& $(LN_S) folder.png user-desktop.png \
&& $(RM) user-home.png \
&& $(LN_S) folder.png user-home.png \
+ && $(LN_S) application-exit.png gtk-quit.png \
+ && $(LN_S) dialog-information.png gtk-info.png \
+ && $(LN_S) document-new.png gtk-file.png \
+ && $(LN_S) document-open.png gtk-open.png \
+ && $(LN_S) document-print-preview.png gtk-print-preview.png \
+ && $(LN_S) document-print.png gtk-print.png \
+ && $(LN_S) document-properties.png gtk-properties.png \
+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \
+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \
+ && $(LN_S) document-save-as.png gtk-save-as.png \
+ && $(LN_S) document-x-generic.png gtk-new.png \
+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \
+ && $(LN_S) edit-clear.png gtk-clear.png \
+ && $(LN_S) edit-copy.png gtk-copy.png \
+ && $(LN_S) edit-cut.png gtk-cut.png \
+ && $(LN_S) edit-delete.png gtk-delete.png \
+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \
+ && $(LN_S) edit-find.png gtk-find.png \
+ && $(LN_S) edit-paste.png gtk-paste.png \
+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \
+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \
+ && $(LN_S) edit-select-all.png gtk-select-all.png \
+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \
+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \
+ && $(LN_S) folder.png gtk-directory.png \
+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \
+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \
+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \
+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \
+ && $(LN_S) format-justify-center.png gtk-justify-center.png \
+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \
+ && $(LN_S) format-justify-left.png gtk-justify-left.png \
+ && $(LN_S) format-justify-right.png gtk-justify-right.png \
+ && $(LN_S) format-text-bold.png gtk-bold.png \
+ && $(LN_S) format-text-italic.png gtk-italic.png \
+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \
+ && $(LN_S) format-text-underline.png gtk-underline.png \
+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \
+ && $(LN_S) go-down.png gtk-go-down.png \
+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \
+ && $(LN_S) go-home.png gtk-home.png \
+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \
+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \
+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \
+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \
+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \
+ && $(LN_S) go-top.png gtk-goto-top.png \
+ && $(LN_S) go-up.png gtk-go-up.png \
+ && $(LN_S) help-about.png gtk-about.png \
+ && $(LN_S) help-contents.png gtk-help.png \
+ && $(LN_S) image-missing.png gtk-missing-image.png \
+ && $(LN_S) list-add.png gtk-add.png \
+ && $(LN_S) list-remove.png gtk-remove.png \
+ && $(LN_S) media-floppy.png gtk-floppy.png \
+ && $(LN_S) media-optical.png gtk-cdrom.png \
+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \
+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \
+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \
+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \
+ && $(LN_S) media-record.png gtk-media-record.png \
+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \
+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \
+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \
+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \
+ && $(LN_S) network-idle.png gtk-network.png \
+ && $(LN_S) printer-error.png gtk-print-error.png \
+ && $(LN_S) printer-info.png gtk-print-report.png \
+ && $(LN_S) printer-paused.png gtk-print-paused.png \
+ && $(LN_S) printer-warning.png gtk-print-warning.png \
+ && $(LN_S) process-stop.png gtk-stop.png \
+ && $(LN_S) system-run.png gtk-execute.png \
+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \
+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \
+ && $(LN_S) view-refresh.png gtk-refresh.png \
+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \
+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \
+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \
+ && $(LN_S) window-close.png gtk-close.png \
+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \
+ && $(LN_S) zoom-in.png gtk-zoom-in.png \
+ && $(LN_S) zoom-original.png gtk-zoom-100.png \
+ && $(LN_S) zoom-out.png gtk-zoom-out.png \
) done \
+ && (cd stock-icons/48 \
+ && $(LN_S) dialog-error.png gtk-dialog-error.png) \
&& touch stamp-icons
gtkbuiltincache.h: @REBUILD@ stamp-icons

19
pkgs/development/libraries/harfbuzz/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, glib, freetype }:
stdenv.mkDerivation rec {
name = "harfbuzz-0.9.4";
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
sha256 = "2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc";
};
buildInputs = [ pkgconfig glib freetype ];
meta = {
description = "An OpenType text shaping engine";
homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/json-glib/default.nix
View File

@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
src = fetchurl_gnome { src = fetchurl_gnome {
project = "json-glib"; project = "json-glib";
major = "0"; minor = "14"; patchlevel = "0"; extension = "xz"; major = "0"; minor = "14"; patchlevel = "2"; extension = "xz";
sha256 = "0mpw996cyidspjwns281l5haj9i8azpkfpl4jf98lh3kcqcr07l2"; sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq";
}; };
propagatedBuildInputs = [ glib ]; propagatedBuildInputs = [ glib ];

10
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,20 +1,20 @@
{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}: { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdrm-2.4.29"; name = "libdrm-2.4.33";
src = fetchurl { src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2"; sha256 = "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd";
}; };
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];
buildInputs = [ libpthreadstubs libpciaccess cairo udev ]; buildInputs = [ libpthreadstubs libpciaccess udev ];
patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
preConfigure = stdenv.lib.optionalString stdenv.isDarwin preConfigure = stdenv.lib.optionalString stdenv.isDarwin
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--enable-nouveau-experimental-api" configureFlags = [ "--enable-nouveau-experimental-api"
"--enable-radeon-experimental-api" "--enable-radeon-experimental-api"

8
pkgs/development/libraries/libgsf/default.nix
View File

@ -7,11 +7,11 @@ assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != n
&& glib != null; && glib != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgsf-1.14.22"; name = "libgsf-1.14.23";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/libgsf/1.14/libgsf-1.14.22.tar.xz; url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5"; sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz";
}; };
buildNativeInputs = [ intltool pkgconfig ]; buildNativeInputs = [ intltool pkgconfig ];
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
patches = [ ./syscall-name-clash.patch ];
meta = { meta = {
homepage = http://www.gnome.org/projects/libgsf; homepage = http://www.gnome.org/projects/libgsf;
license = "LGPLv2"; license = "LGPLv2";

120
pkgs/development/libraries/libgsf/syscall-name-clash.patch Normal file
View File

@ -0,0 +1,120 @@
diff -Naur libgsf-1.14.23-orig/tests/test-cp-msole.c libgsf-1.14.23/tests/test-cp-msole.c
--- libgsf-1.14.23-orig/tests/test-cp-msole.c 2009-05-18 21:55:48.000000000 -0400
+++ libgsf-1.14.23/tests/test-cp-msole.c 2012-07-15 03:52:03.858382670 -0400
@@ -34,7 +34,7 @@
static void clone_dir (GsfInfile *in, GsfOutfile *out);
static void
-clone (GsfInput *input, GsfOutput *output)
+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output)
{
if (gsf_input_size (input) > 0) {
guint8 const *data;
@@ -87,7 +87,7 @@
gsf_infile_name_by_index (in, i),
is_dir);
- clone (new_input, new_output);
+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (new_input, new_output);
}
/* An observation: when you think about the explanation to is_dir
* above, you realize that clone_dir is called even for regular files.
@@ -137,7 +137,7 @@
outfile = gsf_outfile_msole_new (output);
g_object_unref (G_OBJECT (output));
- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile));
return 0;
}
diff -Naur libgsf-1.14.23-orig/tests/test-cp-zip.c libgsf-1.14.23/tests/test-cp-zip.c
--- libgsf-1.14.23-orig/tests/test-cp-zip.c 2009-05-18 21:55:48.000000000 -0400
+++ libgsf-1.14.23/tests/test-cp-zip.c 2012-07-15 03:54:53.719198559 -0400
@@ -32,7 +32,7 @@
#include <stdio.h>
static void
-clone (GsfInfile *in, GsfOutfile *out)
+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInfile *in, GsfOutfile *out)
{
GsfInput *input = GSF_INPUT (in);
GsfOutput *output = GSF_OUTPUT (out);
@@ -85,7 +85,7 @@
output = gsf_outfile_new_child_full (out, name, is_dir,
"compression-level", level,
NULL);
- clone (GSF_INFILE (input), GSF_OUTFILE (output));
+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INFILE (input), GSF_OUTFILE (output));
}
}
gsf_output_close (GSF_OUTPUT (out));
@@ -137,7 +137,7 @@
outfile = gsf_outfile_zip_new (output, &err);
g_object_unref (G_OBJECT (output));
- clone (infile, outfile);
+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (infile, outfile);
return 0;
}
diff -Naur libgsf-1.14.23-orig/tests/test-dump-msole.c libgsf-1.14.23/tests/test-dump-msole.c
--- libgsf-1.14.23-orig/tests/test-dump-msole.c 2011-12-07 18:05:18.000000000 -0500
+++ libgsf-1.14.23/tests/test-dump-msole.c 2012-07-15 03:56:15.581110536 -0400
@@ -32,7 +32,7 @@
#include <stdio.h>
static void
-clone (GsfInput *input, GsfOutput *output)
+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output)
{
guint8 const *data;
size_t len;
@@ -72,7 +72,7 @@
dst = gsf_outfile_new_child (out,
gsf_infile_name_by_index (in, i),
is_dir);
- clone (src, dst);
+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst);
}
}
@@ -118,7 +118,7 @@
g_error_free (err);
return 1;
}
- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile));
return 0;
}
diff -Naur libgsf-1.14.23-orig/tests/test-restore-msole.c libgsf-1.14.23/tests/test-restore-msole.c
--- libgsf-1.14.23-orig/tests/test-restore-msole.c 2011-12-07 18:05:18.000000000 -0500
+++ libgsf-1.14.23/tests/test-restore-msole.c 2012-07-15 03:57:39.972017963 -0400
@@ -32,7 +32,7 @@
#include <stdio.h>
static void
-clone (GsfInput *input, GsfOutput *output)
+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output)
{
guint8 const *data;
size_t len;
@@ -72,7 +72,7 @@
dst = gsf_outfile_new_child (out,
gsf_infile_name_by_index (in, i),
is_dir);
- clone (src, dst);
+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst);
}
}
@@ -111,7 +111,7 @@
outfile = gsf_outfile_msole_new (output);
g_object_unref (G_OBJECT (output));
- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile));
return 0;
}

4
pkgs/development/libraries/libpng/12.nix
View File

@ -3,11 +3,11 @@
assert zlib != null; assert zlib != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpng-1.2.47"; name = "libpng-1.2.50";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz"; url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx"; sha256 = "1rz8v3cvy1zzpagxn91lj8swb9vf75rz3yyi18v7zb4jihgzh927";
}; };
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];

4
pkgs/development/libraries/libpng/default.nix
View File

@ -3,11 +3,11 @@
assert zlib != null; assert zlib != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpng-1.5.10"; name = "libpng-1.5.13";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz"; url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "0pb096zn6iyza28js4j7krvcw23b979igfi315aqmvx622bw6jfx"; sha256 = "1vks4mqv4140b10kp53qrywsx9m4xan5ibwsrlmf42ni075zjhxq";
}; };
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];

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

@ -2,11 +2,11 @@
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libsoup-2.36.1"; name = "libsoup-2.38.1";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz; url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk"; sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
}; };

14
pkgs/development/libraries/libtiff/default.nix
View File

@ -1,18 +1,22 @@
{ stdenv, fetchurl, zlib, libjpeg }: { stdenv, fetchurl, zlib, libjpeg }:
stdenv.mkDerivation { let version = "3.9.7"; in
name = "libtiff-3.9.4";
stdenv.mkDerivation rec {
name = "libtiff-${version}";
src = fetchurl { src = fetchurl {
urls = urls =
[ ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz"
http://download.osgeo.org/libtiff/tiff-3.9.4.tar.gz "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
]; ];
sha256 = "19hxd773yxcs4lxlc3zfdkz5aiv705vj2jvy5srpqkxpbw3nvdv7"; sha256 = "0spg1hr5rsrmg88sfzb05qnf0haspq7r5hvdkxg5zib1rva4vmpm";
}; };
propagatedBuildInputs = [ zlib libjpeg ]; propagatedBuildInputs = [ zlib libjpeg ];
enableParallelBuilding = true;
meta = { meta = {
description = "Library and utilities for working with the TIFF image file format"; description = "Library and utilities for working with the TIFF image file format";
homepage = http://www.libtiff.org/; homepage = http://www.libtiff.org/;

4
pkgs/development/libraries/libusb1/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libusb-1.0.8"; name = "libusb-1.0.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libusb/${name}.tar.bz2"; url = "mirror://sourceforge/libusb/${name}.tar.bz2";
sha256 = "1afvpaqnl5plqg95nkvsl4sj9d6ckrmjq44mql8l4zqgf6jx7l11"; sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879";
}; };
meta = { meta = {

26
pkgs/development/libraries/libxml2/default.nix
View File

@ -1,28 +1,34 @@
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }: { stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
assert pythonSupport -> python != null; assert pythonSupport -> python != null;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "libxml2-2.7.8"; name = "libxml2-2.9.0";
src = fetchurl { src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.8.tar.gz; url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
sha256 = "6a33c3a2d18b902cd049e0faa25dd39f9b554a5b09a3bb56ee07dd7938b11c54"; sha256 = "10ib8bpar2pl68aqksfinvfmqknwnk7i35ibq6yjl8dpb0cxj9dd";
}; };
configureFlags = '' patches = [ ./pthread-once-init.patch ];
${if pythonSupport then "--with-python=${python}" else ""}
'';
propagatedBuildInputs = [zlib]; configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}";
buildInputs = stdenv.lib.optional pythonSupport [ python ];
propagatedBuildInputs = [ zlib ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
passthru = {inherit pythonSupport;}; passthru = { inherit pythonSupport; };
enableParallelBuilding = true;
meta = { meta = {
homepage = http://xmlsoft.org/; homepage = http://xmlsoft.org/;
description = "A XML parsing library for C"; description = "A XML parsing library for C";
license = "bsd"; license = "bsd";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
}; };
} }

35
pkgs/development/libraries/libxml2/pthread-once-init.patch Normal file
View File

@ -0,0 +1,35 @@
http://git.gnome.org/browse/libxml2/commit/?id=3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e
From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001
From: Friedrich Haubensak <hsk@fli-leibniz.de>
Date: Wed, 12 Sep 2012 15:34:53 +0000
Subject: Fix a thread portability problem
cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10
I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in
a structure assignment anyway
---
diff --git a/threads.c b/threads.c
index f206149..7e85a26 100644
--- a/threads.c
+++ b/threads.c
@@ -146,6 +146,7 @@ struct _xmlRMutex {
static pthread_key_t globalkey;
static pthread_t mainthread;
static pthread_once_t once_control = PTHREAD_ONCE_INIT;
+static pthread_once_t once_control_init = PTHREAD_ONCE_INIT;
static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
#elif defined HAVE_WIN32_THREADS
#if defined(HAVE_COMPILER_TLS)
@@ -915,7 +916,7 @@ xmlCleanupThreads(void)
#ifdef HAVE_PTHREAD_H
if ((libxml_is_threaded) && (pthread_key_delete != NULL))
pthread_key_delete(globalkey);
- once_control = PTHREAD_ONCE_INIT;
+ once_control = once_control_init;
#elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
if (globalkey != TLS_OUT_OF_INDEXES) {
xmlGlobalStateCleanupHelperParams *p;
--
cgit v0.9.0.2

6
pkgs/development/libraries/libxml2/setup-hook.sh
View File

@ -1,10 +1,10 @@
addXMLCatalogs () { addXMLCatalogs () {
for kind in dtd xsl; do for kind in dtd xsl; do
if test -d $1/xml/$kind; then if test -d $1/xml/$kind; then
for i in $(find $1/xml/$kind -name catalog.xml); do for i in $(find $1/xml/$kind -name catalog.xml); do
export XML_CATALOG_FILES="$XML_CATALOG_FILES $i" export XML_CATALOG_FILES="$XML_CATALOG_FILES $i"
done done
fi fi
done done
} }

10
pkgs/development/libraries/libxslt/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, libxml2 }: { stdenv, fetchurl, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libxslt-1.1.26"; name = "libxslt-1.1.27";
src = fetchurl { src = fetchurl {
url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
sha256 = "1c9xdv39jvq1hp16gsbi56hbz032dmqyy0fpi4ls1y3152s55pam"; sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n";
}; };
buildInputs = [libxml2]; buildInputs = [ libxml2 ];
postInstall = '' postInstall = ''
mkdir -p $out/nix-support mkdir -p $out/nix-support
@ -19,5 +19,7 @@ stdenv.mkDerivation rec {
homepage = http://xmlsoft.org/XSLT/; homepage = http://xmlsoft.org/XSLT/;
description = "A C library and tools to do XSL transformations"; description = "A C library and tools to do XSL transformations";
license = "bsd"; license = "bsd";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
}; };
} }

16
pkgs/development/libraries/loudmouth/default.nix
View File

@ -1,16 +1,22 @@
{stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib}: { stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "loudmouth-1.4.3"; name = "loudmouth-1.4.3";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2; url = "mirror://gnome/sources/loudmouth/1.4/${name}.tar.bz2";
md5 = "55339ca42494690c3942ee1465a96937"; md5 = "55339ca42494690c3942ee1465a96937";
}; };
patches = [ ./glib-2.32.patch ];
configureFlags = "--with-ssl=openssl"; configureFlags = "--with-ssl=openssl";
propagatedBuildInputs = [openssl libidn glib zlib]; propagatedBuildInputs = [ openssl libidn glib zlib ];
buildInputs = [pkgconfig]; buildInputs = [ pkgconfig ];
meta = {
description = "A lightweight C library for the Jabber protocol";
};
} }

13
pkgs/development/libraries/loudmouth/glib-2.32.patch Normal file
View File

@ -0,0 +1,13 @@
Index: loudmouth-1.4.3/loudmouth/lm-error.c
===================================================================
--- loudmouth-1.4.3.orig/loudmouth/lm-error.c
+++ loudmouth-1.4.3/loudmouth/lm-error.c
@@ -19,7 +19,7 @@
*/
#include <config.h>
-#include <glib/gerror.h>
+#include <glib.h>
#include "lm-error.h"
/**

14
pkgs/development/libraries/mesa/default.nix
View File

@ -7,27 +7,24 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa" throw "unsupported platform for Mesa"
else else
let version = "7.11.2"; in let version = "8.0.4"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mesa-${version}"; name = "mesa-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p"; md5 = "d546f988adfdf986cff45b1efa2d8a46";
}; };
patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional patches =
(stdenv.system == "mips64el-linux") ./mips_wmb.patch; stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
# r300
configureFlags = configureFlags =
" --with-driver=dri --enable-gl-osmesa --enable-gles1" " --enable-gles1 --enable-gles2 --enable-gallium-egl"
+ " --with-gallium-drivers=i915,nouveau,r600,svga,swrast" + " --with-gallium-drivers=i915,nouveau,r600,svga,swrast"
+ " --enable-gles2 --enable-gallium-egl --disable-glx-tls"
+ " --enable-xcb --enable-egl --disable-glut"
# Texture floats are patented, see docs/patents.txt # Texture floats are patented, see docs/patents.txt
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
@ -44,7 +41,6 @@ stdenv.mkDerivation {
description = "An open source implementation of OpenGL"; description = "An open source implementation of OpenGL";
homepage = http://www.mesa3d.org/; homepage = http://www.mesa3d.org/;
license = "bsd"; license = "bsd";
platforms = stdenv.lib.platforms.mesaPlatforms; platforms = stdenv.lib.platforms.mesaPlatforms;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = [ stdenv.lib.maintainers.simons ];
}; };

8
pkgs/development/libraries/pango/1.29.x.nix → pkgs/development/libraries/pango/1.30.x.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pango-1.29.4"; name = "pango-1.30.1";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz; url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz";
sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s"; sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
}; };
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ x11 glib cairo libpng ]; propagatedBuildInputs = [ x11 glib cairo libpng ];
enableParallelBuilding = true;
postInstall = "rm -rf $out/share/gtk-doc"; postInstall = "rm -rf $out/share/gtk-doc";
meta = { meta = {

50
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -7,13 +7,13 @@
, perl, coreutils, libXi , perl, coreutils, libXi
, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base , buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base
, buildWebkit ? true , buildWebkit ? true
, flashplayerFix ? true, gdk_pixbuf , flashplayerFix ? false, gdk_pixbuf
, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
}: }:
let with stdenv.lib;
v = "4.8.2";
in let v = "4.8.3"; in
# TODO: # TODO:
# * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid
@ -24,27 +24,26 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz"; url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz";
sha256 = "0y93vkkn44md37gyg4y8sc9ylk27xkniaimfcpdcwd090qnjl6wj"; sha256 = "0a67riy4i0xj6j7vmckd0nakras3rl3rzx0r83h1p1i4z5s2kxzi";
}; };
patches = [ ( substituteAll { patches =
[ ./glib-2.32.patch
(substituteAll {
src = ./dlopen-absolute-paths.diff; src = ./dlopen-absolute-paths.diff;
inherit cups icu libXfixes; inherit cups icu libXfixes;
glibc = stdenv.gcc.libc; glibc = stdenv.gcc.libc;
}) })
] ++ stdenv.lib.optional gtkStyle ( ] ++ stdenv.lib.optional gtkStyle (substituteAll {
substituteAll {
src = ./dlopen-gtkstyle.diff; src = ./dlopen-gtkstyle.diff;
# substituteAll ignores env vars starting with capital letter # substituteAll ignores env vars starting with capital letter
gconf = GConf; gconf = GConf;
inherit gnome_vfs libgnomeui gtk; inherit gnome_vfs libgnomeui gtk;
} })
) ++ stdenv.lib.optional flashplayerFix ( ++ stdenv.lib.optional flashplayerFix (substituteAll {
substituteAll {
src = ./dlopen-webkit-nsplugin.diff; src = ./dlopen-webkit-nsplugin.diff;
inherit gtk gdk_pixbuf; inherit gtk gdk_pixbuf;
} });
);
preConfigure = preConfigure =
'' ''
@ -81,18 +80,16 @@ stdenv.mkDerivation rec {
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes [ libXrender libXrandr libXinerama libXcursor libXext libXfixes
libXv libXi libSM libXv libXi libSM
] ]
++ (stdenv.lib.optional (stdenv.lib.lists.elem stdenv.system ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa
stdenv.lib.platforms.mesaPlatforms) ++ optional (buildWebkit || buildMultimedia) alsaLib
mesa)
++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib)
++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ] ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
++ (stdenv.lib.optionals (buildWebkit || buildMultimedia) ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];
[ gstreamer gst_plugins_base ]);
# The following libraries are only used in plugins # The following libraries are only used in plugins
buildInputs = [ cups # Qt dlopen's libcups instead of linking to it buildInputs =
mysql postgresql sqlite libjpeg libmng libtiff icu ] [ cups # Qt dlopen's libcups instead of linking to it
++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ]; mysql postgresql sqlite libjpeg libmng libtiff icu ]
++ optionals gtkStyle [ gtk gdk_pixbuf ];
buildNativeInputs = [ perl pkgconfig which ]; buildNativeInputs = [ perl pkgconfig which ];
@ -119,7 +116,7 @@ stdenv.mkDerivation rec {
-no-svg -no-svg
-make qmake -make libs -nomake tools -make qmake -make libs -nomake tools
-nomake demos -nomake examples -nomake docs -nomake demos -nomake examples -nomake docs
'' + stdenv.lib.optionalString isMingw " -xplatform win32-g++-4.6"; '' + optionalString isMingw " -xplatform win32-g++-4.6";
patches = []; patches = [];
preConfigure = '' preConfigure = ''
sed -i -e 's/ g++/ ${stdenv.cross.config}-g++/' \ sed -i -e 's/ g++/ ${stdenv.cross.config}-g++/' \
@ -136,12 +133,11 @@ stdenv.mkDerivation rec {
''; '';
dontSetConfigureCross = true; dontSetConfigureCross = true;
dontStrip = true; dontStrip = true;
} // (if isMingw then } // optionalAttrs isMingw {
{
propagatedBuildInputs = [ ]; propagatedBuildInputs = [ ];
} else {}); };
meta = with stdenv.lib; { meta = {
homepage = http://qt.nokia.com/products; homepage = http://qt.nokia.com/products;
description = "A cross-platform application framework for C++"; description = "A cross-platform application framework for C++";
license = "GPL/LGPL"; license = "GPL/LGPL";

63
pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
View File

@ -1,5 +1,27 @@
--- a/src/gui/painting/qcups.cpp 2011-12-08 09:06:02.000000000 +0400 diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.cpp qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp
+++ b/src/gui/painting/qcups.cpp 2011-12-18 12:17:07.000000000 +0400 --- qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.cpp 2012-09-10 21:36:50.000000000 -0400
+++ qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp 2012-09-28 22:57:40.764153828 -0400
@@ -81,7 +81,7 @@
if (status == NotLoaded) {
// resolve libicui18n
- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT));
lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
if (!lib.load()) {
qWarning() << "Unable to load library icui18n" << lib.errorString();
@@ -111,7 +111,7 @@
}
// resolve libicuuc
- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT));
ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
if (!ucLib.load()) {
qWarning() << "Unable to load library icuuc" << ucLib.errorString();
diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp qt-everywhere-opensource-src-4.8.3/src/gui/painting/qcups.cpp
--- qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp 2012-09-10 21:36:51.000000000 -0400
+++ qt-everywhere-opensource-src-4.8.3/src/gui/painting/qcups.cpp 2012-09-28 18:08:26.600720491 -0400
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
static void resolveCups() static void resolveCups()
@ -9,8 +31,9 @@
if(cupsLib.load()) { if(cupsLib.load()) {
_cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
_cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");
--- a/src/gui/painting/qprinterinfo_unix.cpp 2011-12-08 09:06:02.000000000 +0400 diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_unix.cpp qt-everywhere-opensource-src-4.8.3/src/gui/painting/qprinterinfo_unix.cpp
+++ b/src/gui/painting/qprinterinfo_unix.cpp 2011-12-23 16:22:15.000000000 +0400 --- qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_unix.cpp 2012-09-10 21:36:51.000000000 -0400
+++ qt-everywhere-opensource-src-4.8.3/src/gui/painting/qprinterinfo_unix.cpp 2012-09-28 18:08:26.601720488 -0400
@@ -454,7 +454,7 @@ @@ -454,7 +454,7 @@
char *domain; char *domain;
int err; int err;
@ -20,39 +43,21 @@
typedef int (*ypGetDefaultDomain)(char **); typedef int (*ypGetDefaultDomain)(char **);
ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain"); ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain");
typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *); typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *);
--- a/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:26:07.000000000 +0400 diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-4.8.3/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:25:55.000000000 +0400 --- qt-everywhere-opensource-src-4.8.3-orig/src/network/kernel/qhostinfo_unix.cpp 2012-09-10 21:36:51.000000000 -0400
+++ qt-everywhere-opensource-src-4.8.3/src/network/kernel/qhostinfo_unix.cpp 2012-09-28 18:08:53.186643755 -0400
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
static void resolveLibrary() static void resolveLibrary()
{ {
#ifndef QT_NO_LIBRARY #ifndef QT_NO_LIBRARY
- QLibrary lib(QLatin1String("resolv")); - QLibrary lib(QLatin1String("resolv"));
+ QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); + QLibrary lib(QLatin1String("@glibc@/lib/libresolv"));
lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
if (!lib.load()) if (!lib.load())
return; return;
diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/plugins/platforms/xlib/qxlibstatic.cpp qt-everywhere-opensource-src-4.8.3/src/plugins/platforms/xlib/qxlibstatic.cpp
--- a/src/corelib/tools/qlocale_icu.cpp 2011-12-08 09:06:03.000000000 +0400 --- qt-everywhere-opensource-src-4.8.3-orig/src/plugins/platforms/xlib/qxlibstatic.cpp 2012-09-10 21:36:51.000000000 -0400
+++ b/src/corelib/tools/qlocale_icu.cpp 2011-12-23 16:29:15.000000000 +0400 +++ qt-everywhere-opensource-src-4.8.3/src/plugins/platforms/xlib/qxlibstatic.cpp 2012-09-28 18:08:26.601720488 -0400
@@ -81,7 +81,7 @@
if (status == NotLoaded) {
// resolve libicui18n
- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT));
if (!lib.load()) {
qWarning() << "Unable to load library icui18n" << lib.errorString();
status = ErrorLoading;
@@ -110,7 +110,7 @@
}
// resolve libicuuc
- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT));
if (!ucLib.load()) {
qWarning() << "Unable to load library icuuc" << ucLib.errorString();
status = ErrorLoading;
--- a/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-08 09:06:02.000000000 +0400
+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-23 20:38:49.000000000 +0400
@@ -242,7 +242,7 @@ @@ -242,7 +242,7 @@
} }

12
pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
--- qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-04-26 15:46:22.000000000 -0400
+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-07-14 22:47:02.145152876 -0400
@@ -89,7 +89,7 @@
#include <pthread.h>
#elif PLATFORM(GTK)
#include <wtf/gtk/GOwnPtr.h>
-typedef struct _GMutex GMutex;
+typedef union _GMutex GMutex;
typedef struct _GCond GCond;
#endif

11
pkgs/development/libraries/webkit/default.nix
View File

@ -14,7 +14,7 @@ rec {
sqlite icu gperf bison flex autoconf automake libtool sqlite icu gperf bison flex autoconf automake libtool
perl intltool pkgconfig libsoup gtkdoc libXt libproxy perl intltool pkgconfig libsoup gtkdoc libXt libproxy
enchant python ruby which renderproto libXrender geoclue enchant python ruby which renderproto libXrender geoclue
kbproto kbproto mesa
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -54,7 +54,7 @@ rec {
]; ];
/* doConfigure should be specified separately */ /* doConfigure should be specified separately */
phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") phaseNames = ["setVars" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".")
"doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
setVars = fullDepEntry ('' setVars = fullDepEntry (''
@ -78,6 +78,13 @@ rec {
sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h') sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];
# See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html
fixConfigure = fullDepEntry (''
sed -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \
-e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \
configure{,.ac}
'') ["minInit" "doUnpack"];
name = s.name; name = s.name;
meta = { meta = {
description = "WebKit - a fast and correct HTML renderer"; description = "WebKit - a fast and correct HTML renderer";

11
pkgs/development/libraries/webkit/src-for-default.nix
View File

@ -1,9 +1,10 @@
rec { rec {
version="1.6.3"; version="1.8.1";
name="webkit-1.6.3"; name="webkit-1.8.1";
hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j"; hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls";
url="http://webkitgtk.org/webkit-1.6.3.tar.xz"; url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz"; advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
} }

11
pkgs/misc/cups/default.nix
View File

@ -1,9 +1,8 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
, dbus, libusb, acl }: , dbus, libusb1, acl }:
let version = "1.5.4"; in
let
version = "1.5.2";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cups-${version}"; name = "cups-${version}";
@ -11,10 +10,10 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
sha256 = "1yw7l5rq93zg91akqf68b871frrs4q0krc9cx43ly7v3ih8all5i"; md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
}; };
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ; ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ;
propagatedBuildInputs = [ openssl ]; propagatedBuildInputs = [ openssl ];

8
pkgs/misc/drivers/foomatic-filters/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl, cups, coreutils, gnused }: { stdenv, fetchurl, pkgconfig, perl, cups, dbus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "foomatic-filters-4.0.6"; name = "foomatic-filters-4.0.12";
src = fetchurl { src = fetchurl {
url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz"; url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz";
sha256 = "0wa9hlq7s99sh50kl6bj8j0vxrz7pcbwdnqs1yfjjhqshfh7hsav"; sha256 = "17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8";
}; };
buildInputs = [ perl cups ]; buildInputs = [ pkgconfig perl cups dbus ];
preConfigure = preConfigure =
'' ''

63
pkgs/os-specific/linux/hal/default.nix
View File

@ -1,63 +0,0 @@
{ stdenv, fetchurl, pkgconfig, python, pciutils, expat
, libusb, dbus, dbus_glib, glib, libuuid, perl
, perlXMLParser, gettext, zlib, gperf, consolekit, policykit
, libsmbios, dmidecode, udev, utillinux, pmutils, usbutils
, eject, upstart
}:
assert stdenv ? glibc;
let
isPC = stdenv.isi686 || stdenv.isx86_64;
changeDmidecode = if isPC then
"--replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode"
else "";
in
stdenv.mkDerivation rec {
name = "hal-0.5.14";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "00ld3afcbh4ckb8sli63mm2w69zh6ip4axhy1lxyybgiabxaqfij";
};
buildInputs = [
pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib
libuuid perl perlXMLParser gettext zlib gperf
consolekit policykit
];
# !!! Hm, maybe the pci/usb.ids location should be in /etc, so that
# we don't have to rebuild HAL when we update the PCI/USB IDs.
configureFlags = ''
--with-pci-ids=${pciutils}/share
--with-usb-ids=${usbutils}/share
--localstatedir=/var
--with-eject=${eject}/bin/eject
--with-linux-input-header=${stdenv.glibc}/include/linux/input.h
--enable-umount-helper
'';
propagatedBuildInputs = [ libusb ]
++ stdenv.lib.optional isPC libsmbios;
preConfigure = ''
for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \
hald/linux/coldplug.c hald/linux/blockdev.c \
tools/hal-storage-mount.c ./tools/hal-storage-shared.c \
tools/hal-system-power-pm-is-supported.c \
tools/linux/hal-*-linux
do
substituteInPlace $i \
${changeDmidecode} \
${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \
--replace /bin/mount ${utillinux}/bin/mount \
--replace /bin/umount ${utillinux}/bin/umount \
--replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \
--replace /usr/sbin/pm ${pmutils}/sbin/pm \
--replace /sbin/shutdown ${upstart}/sbin/shutdown
done
'';
installFlags = "slashsbindir=$(out)/sbin";
}

20
pkgs/os-specific/linux/hal/hal-evt.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, libxml2, pkgconfig, boolstuff, hal, dbus_glib }:
stdenv.mkDerivation {
name = "hal-evt-0.1.4";
src = fetchurl {
url = http://savannah.nongnu.org/download/halevt/halevt-0.1.4.tar.gz;
sha256 = "173dphyzpicjz5pnw0d6wmibvib5h99nh1gmyvcqpgvf8la5vrps";
};
buildInputs = [ libxml2 pkgconfig boolstuff hal dbus_glib ];
meta = {
description = "Execute commands on hal events";
homepage = http://www.nongnu.org/halevt/;
license = "GPLv2";
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};
}

15
pkgs/os-specific/linux/hal/info.nix
View File

@ -1,15 +0,0 @@
{stdenv, fetchurl, pkgconfig}:
stdenv.mkDerivation rec {
name = "hal-info-20091130";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "092jhzpxa2h8djf8pijql92m70q87yds22686ryrfna3xbm90niv";
};
meta = {
homepage = http://www.freedesktop.org/wiki/Software/hal;
description = "Hardware data and quirks for HAL";
};
}

19
pkgs/os-specific/linux/hal/synaptics.nix
View File

@ -1,19 +0,0 @@
{stdenv}:
stdenv.mkDerivation {
name = "hal-info-synaptics";
buildCommand = ''
mkdir -p $out/share/hal/fdi/information/15-osvendor/
cat << EOF > $out/share/hal/fdi/information/15-osvendor/10-x11-synaptics.fdi
<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.touchpad">
<merge key="input.x11_driver" type="string">synaptics</merge>
<merge key="input.x11_options.AlwaysCore" type="string">true</merge>
<merge key="input.x11_options.Protocol" type="string">event</merge>
</match>
</device>
</deviceinfo>
EOF
'';
}

39
pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch Normal file
View File

@ -0,0 +1,39 @@
Work around LVM/cryptsetup errors like:
semid 32768: semop failed for cookie 0xd4d41f4: incorrect semaphore state
Failed to set a proper state for notification semaphore identified by cookie value 223166964 (0xd4d41f4) to initialize waiting for incoming notifications.
and (when running "cryptsetup --debug"):
Uevent not generated! Calling udev_complete internally to avoid process lock-up.
Here for some reason libdm *thinks* that the uevent hasn't been
emitted, so it calls udev_complete. But the uevent actually *has*
been emitted, so udev calls ‘dmsetup udevcomplete’ as well, leading to
a race.
This is probably a reoccurence of the problem described here:
http://www.redhat.com/archives/dm-devel/2011-August/msg00075.html
http://www.redhat.com/archives/linux-lvm/2011-September/msg00023.html
which was fixed in the kernel, so it's not clear why it's surfacing
again. Maybe netlink_broadcast_filtered() has started returning some
other bogus error code.
diff -ru -x '*~' LVM2.2.02.98/libdm/ioctl/libdm-iface.c LVM2.2.02.98-new/libdm/ioctl/libdm-iface.c
--- LVM2.2.02.98/libdm/ioctl/libdm-iface.c 2012-10-15 10:24:58.000000000 -0400
+++ LVM2.2.02.98-new/libdm/ioctl/libdm-iface.c 2012-10-15 14:19:06.774363736 -0400
@@ -1754,9 +1754,12 @@
if (ioctl_with_uevent && dm_udev_get_sync_support() &&
!_check_uevent_generated(dmi)) {
+ log_debug("warning: Uevent might not be generated!");
+#if 0
log_debug("Uevent not generated! Calling udev_complete "
"internally to avoid process lock-up.");
_udev_complete(dmt);
+#endif
}
if (!_dm_ioctl_unmangle_names(dmt->type, dmi))

6
pkgs/os-specific/linux/lvm2/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
let let
v = "2.02.97"; v = "2.02.98";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -9,9 +9,11 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz"; url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz";
sha256 = "0azwa555dgvixbdw055yj8cj1q6kd0a36nms005iz7la5q0q5npd"; sha256 = "0r6q6z8ip6q5qgkzng0saljassp4912k6i21ra10vq7pzrc0l0vi";
}; };
patches = [ ./assume-uevent-generated.patch ];
configureFlags = configureFlags =
"--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib";

6
pkgs/os-specific/linux/mountall/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }: { stdenv, fetchurl, pkgconfig, libnih, dbus, udev, gettext, autoreconfHook }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mountall-2.35"; name = "mountall-2.35";
@ -10,9 +10,7 @@ stdenv.mkDerivation {
patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ]; patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ];
preConfigure = "rm -R aclocal.m4; gettextize -f; autoreconf -vfi"; buildInputs = [ pkgconfig libnih dbus.libs udev gettext autoreconfHook ];
buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool gettext ];
makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs"; makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs";

22
pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch Normal file
View File

@ -0,0 +1,22 @@
Do start device units for uninitialised encrypted devices, because the
service that initialises the filesystem depends on the appearance of
the device unit. Also, this makes more sense to me: the device is
ready; it's the filesystem that's not, but taking care of that is the
responsibility of the mount unit. (However, this ignores the fsck
unit, so it's not perfect...)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index d17bdd9..040b10e 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd"
SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
-# Ignore encrypted devices with no identified superblock on it, since
-# we are probably still calling mke2fs or mkswap on it.
-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
-
# Ignore raid devices that are not yet assembled and started
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"

7
pkgs/os-specific/linux/systemd/default.nix
View File

@ -13,7 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2";
}; };
patches = [ ./reexec.patch ./ignore-duplicates.patch ./fix-device-aliases.patch ]; patches =
[ ./reexec.patch
./ignore-duplicates.patch
./fix-device-aliases.patch
./crypt-devices-are-ready.patch
];
buildInputs = buildInputs =
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl [ pkgconfig intltool gperf libcap dbus kmod xz pam acl

14
pkgs/os-specific/linux/usbutils/default.nix
View File

@ -1,24 +1,24 @@
{ stdenv, fetchurl, pkgconfig, libusb }: { stdenv, fetchurl, pkgconfig, libusb1 }:
let let
# Obtained from http://www.linux-usb.org/usb.ids.bz2. # Obtained from http://www.linux-usb.org/usb.ids.bz2.
usbids = fetchurl { usbids = fetchurl {
url = http://nixos.org/tarballs/usb.ids.20100720.bz2; url = http://nixos.org/tarballs/usb.ids.20120920.bz2;
sha256 = "0krncssk0b10z6grw305824zma953l3g2rb7jkk25mb78pw5fd5d"; sha256 = "0sz860g7grf6kx22p49s6j8h85c69ymcw16a8110klzfl9hl9hli";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "usbutils-0.86"; name = "usbutils-006";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.gz"; url = mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz;
sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk"; sha256 = "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr";
}; };
buildInputs = [ pkgconfig libusb ]; buildInputs = [ pkgconfig libusb1 ];
preBuild = "bunzip2 < ${usbids} > usb.ids"; preBuild = "bunzip2 < ${usbids} > usb.ids";

11
pkgs/os-specific/linux/xf86-input-mtrack/default.nix
View File

@ -10,10 +10,11 @@
, xorgserver , xorgserver
, xproto , xproto
, inputproto , inputproto
, pixman
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xf86-input-mtrack-0.2.0"; name = "xf86-input-mtrack-0.3.0";
preConfigure = "autoreconf -vfi"; preConfigure = "autoreconf -vfi";
@ -27,12 +28,15 @@ stdenv.mkDerivation {
xorgserver xorgserver
xproto xproto
inputproto inputproto
pixman
]; ];
CFLAGS = "-I${pixman}/include/pixman-1";
src = fetchurl { src = fetchurl {
name = "xf86-input-mtrack.tar.gz"; name = "xf86-input-mtrack.tar.gz";
url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0"; url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.3.0";
sha256 = "1zvd68dxpjn44ys7ysi3yc95xdjw1rz0s3xwlh3fzpw1ib3wrr3x"; sha256 = "174rdw7gv0wsnjgmwpx4pgjn1zfbylflda4k2dzff6phzxj9yl6v";
}; };
meta = { meta = {
@ -45,3 +49,4 @@ stdenv.mkDerivation {
maintainers = [ stdenv.lib.maintainers.shlevy ]; maintainers = [ stdenv.lib.maintainers.shlevy ];
}; };
} }

10
pkgs/os-specific/linux/xf86-input-wacom/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender, libXinerama , file, inputproto, libX11, libXext, libXi, libXrandr, libXrender
, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev }: , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xf86-input-wacom-0.16.0"; name = "xf86-input-wacom-0.16.0";
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0sc0hmbs3l3ad68iwglbwjv9lg1vd333n1lv72j4nqmk7g57yrii"; sha256 = "0sc0hmbs3l3ad68iwglbwjv9lg1vd333n1lv72j4nqmk7g57yrii";
}; };
buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender libXinerama buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
ncurses pkgconfig randrproto xorgserver xproto udev ]; ncurses pkgconfig randrproto xorgserver xproto udev libXinerama pixman ];
preConfigure = '' preConfigure = ''
mkdir -p $out/share/X11/xorg.conf.d mkdir -p $out/share/X11/xorg.conf.d
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
--with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d"
''; '';
CFLAGS = "-I${pixman}/include/pixman-1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
maintainers = [ maintainers.goibhniu maintainers.urkud ]; maintainers = [ maintainers.goibhniu maintainers.urkud ];
description = "Wacom digitizer driver for X11"; description = "Wacom digitizer driver for X11";

1216
pkgs/servers/x11/xorg/default.nix
View File

File diff suppressed because it is too large Load Diff

10
pkgs/servers/x11/xorg/extra.list
View File

@ -1,8 +1,8 @@
mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901 mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901
mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0 mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0
mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2
mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2
mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2
mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2
mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2

2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -169,7 +169,7 @@ while (<>) {
} }
if ($file =~ /XORG_FONT_UCS2ANY/) { if ($file =~ /XORG_FONT_UCS2ANY/) {
push @requires, "fontutil"; push @requires, "fontutil", "mkfontscale";
$isFont = 1; $isFont = 1;
} }

14
pkgs/servers/x11/xorg/old.list
View File

@ -1,15 +1,15 @@
mirror://xorg/individual/app/twm-1.0.6.tar.bz2 mirror://xorg/individual/app/twm-1.0.7.tar.bz2
mirror://xorg/individual/app/xclock-1.0.5.tar.bz2 mirror://xorg/individual/app/xclock-1.0.6.tar.bz2
mirror://xorg/individual/app/xdm-1.1.10.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
mirror://xorg/individual/app/xfs-1.1.1.tar.bz2 mirror://xorg/individual/app/xfs-1.1.2.tar.bz2
mirror://xorg/individual/app/xinit-1.3.0.tar.bz2 mirror://xorg/individual/app/xinit-1.3.2.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2
mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2
mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2
mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
mirror://xorg/individual/util/imake-1.0.4.tar.bz2 mirror://xorg/individual/util/imake-1.0.5.tar.bz2
mirror://xorg/individual/util/lndir-1.0.2.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2

64
pkgs/servers/x11/xorg/overrides.nix
View File

@ -8,6 +8,10 @@ let
in in
{ {
fontcursormisc = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
};
fontmiscmisc = attrs: attrs // { fontmiscmisc = attrs: attrs // {
postInstall = postInstall =
'' ''
@ -24,7 +28,7 @@ in
}; };
mkfontdir = attrs: attrs // { mkfontdir = attrs: attrs // {
preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR ${xorg.mkfontscale}/bin"; preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin";
}; };
libxcb = attrs : attrs // { libxcb = attrs : attrs // {
@ -95,9 +99,7 @@ in
libXft = attrs: attrs // { libXft = attrs: attrs // {
buildInputs = attrs.buildInputs ++ buildInputs = attrs.buildInputs ++
[ xorg.xproto xorg.libX11 xorg.renderproto ]; [ xorg.xproto xorg.libX11 xorg.renderproto ];
# probably, fontconfig and freetype could be added propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
# pkgconfig seems to be nice, too...
propagatedBuildInputs = [ xorg.libXrender ];
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
}; };
@ -124,13 +126,30 @@ in
buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ];
}; };
xev = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.libXrender ];
};
xf86inputevdev = attrs: attrs // { xf86inputevdev = attrs: attrs // {
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto]; NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto xorg.pixman];
installFlags = "sdkdir=\${out}/include/xorg"; installFlags = "sdkdir=\${out}/include/xorg";
}; };
xf86inputkeyboard = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86inputmouse = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86inputsynaptics = attrs: attrs // { xf86inputsynaptics = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [args.mtdev xorg.pixman];
installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg"; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
}; };
@ -143,7 +162,18 @@ in
}; };
xf86videoati = attrs: attrs // { xf86videoati = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.pixman];
};
xf86videocirrus = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86videofbdev = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
}; };
xf86videoopenchrome = attrs: attrs // rec { xf86videoopenchrome = attrs: attrs // rec {
@ -155,6 +185,16 @@ in
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.libXext]; buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.libXext];
}; };
xf86videonv = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86videovesa = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xdriinfo = attrs: attrs // { xdriinfo = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
}; };
@ -177,6 +217,7 @@ in
xorg.xineramaproto xorg.xf86dgaproto xorg.xineramaproto xorg.xf86dgaproto
xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont
xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto
]; ];
propagatedBuildInputs = propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
@ -189,9 +230,11 @@ in
''; '';
}; };
libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") { libSM = attrs: attrs
configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''"; // { propagatedBuildInputs = [ xorg.libICE ]; }
}; // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
};
lndir = attrs: attrs // { lndir = attrs: attrs // {
preConfigure = '' preConfigure = ''
@ -208,4 +251,7 @@ in
buildInputs = attrs.buildInputs ++ [xorg.libXrender]; buildInputs = attrs.buildInputs ++ [xorg.libXrender];
}; };
xinput = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.libXrender];
};
} }

199
pkgs/servers/x11/xorg/tarballs-7.6.list
View File

@ -1,199 +0,0 @@
mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2
mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2
mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2
mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2
mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2
mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2
mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2
mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2
mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2
mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2
mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2
mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2
mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2
mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2
mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2
mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2
mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2

184
pkgs/servers/x11/xorg/tarballs-7.7.list Normal file
View File

@ -0,0 +1,184 @@
mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2
mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2
mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2
mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/inputproto-2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2
mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2
mirror://xorg/individual/lib/libXrandr-1.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXt-1.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2
mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/util-macros-1.17.tar.bz2
mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-6.14.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2
mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2
mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2

7
pkgs/servers/x11/xorg/unichrome/default.nix
View File

@ -1,24 +1,25 @@
{stdenv, fetchgit, pkgconfig, fontsproto, libdrm, libpciaccess, randrproto, renderproto, {stdenv, fetchgit, pkgconfig, fontsproto, libdrm, libpciaccess, randrproto, renderproto,
videoproto, libX11, videoproto, libX11,
xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake, xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake,
autoconf, libtool, libXext, utilmacros}: autoconf, libtool, libXext, utilmacros, pixman}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xf86-video-unichrome-git"; name = "xf86-video-unichrome-git";
src = fetchgit { src = fetchgit {
url = "git://anongit.freedesktop.org/~libv/xf86-video-unichrome"; url = "git://people.freedesktop.org/~libv/xf86-video-unichrome";
md5 = "6e5e0f8ee204af2385a02e502d1ca8f1"; md5 = "6e5e0f8ee204af2385a02e502d1ca8f1";
rev = "6260e0fc9f0754d101dda014a8f4b5f76f58e978"; rev = "6260e0fc9f0754d101dda014a8f4b5f76f58e978";
}; };
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto
videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC
glproto mesa automake autoconf libtool libXext utilmacros ]; glproto mesa automake autoconf libtool libXext utilmacros pixman ];
preConfigure = "chmod +x autogen.sh"; preConfigure = "chmod +x autogen.sh";
prePatch = '' prePatch = ''
sed s,/bin/bash,/bin/sh, -i git_version.sh sed s,/bin/bash,/bin/sh, -i git_version.sh
''; '';
patches = [ ./configure.patch ]; patches = [ ./configure.patch ];
configureScript = "./autogen.sh"; configureScript = "./autogen.sh";
CFLAGS="-I${pixman}/include/pixman-1";
meta = { meta = {
homepage = "http://unichrome.sourceforge.net/"; homepage = "http://unichrome.sourceforge.net/";

57
pkgs/servers/x11/xorg/xorgserver-dri-path.patch
View File

@ -1,52 +1,19 @@
diff --git a/glx/glxdri.c b/glx/glxdri.c diff -Naur xorg-server-1.12.2-orig/glx/glxdricommon.c xorg-server-1.12.2/glx/glxdricommon.c
index 6122653..3f5fc2b 100644 --- xorg-server-1.12.2-orig/glx/glxdricommon.c 2012-05-17 13:09:02.000000000 -0400
--- a/glx/glxdri.c +++ xorg-server-1.12.2/glx/glxdricommon.c 2012-07-14 14:57:37.972791909 -0400
+++ b/glx/glxdri.c @@ -219,10 +219,14 @@
@@ -1042,8 +1042,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen) int i;
goto handle_error; void *driver;
} char filename[PATH_MAX];
+ char *real_dri_driver_path;
const __DRIextension **extensions;
+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH"); + real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH");
+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path; + if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path;
+ +
snprintf(filename, sizeof filename, "%s/%s_dri.so", snprintf(filename, sizeof filename, "%s/%s_dri.so",
- dri_driver_path, driverName); - dri_driver_path, driverName);
+ real_dri_driver_path, driverName); + real_dri_driver_path, driverName);
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) { if (driver == NULL) {
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index ed7fb4c..135b1c8 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -617,8 +617,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
__glXInitExtensionEnableBits(screen->glx_enable_bits);
- snprintf(filename, sizeof filename,
- "%s/%s_dri.so", dri_driver_path, driverName);
+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH");
+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path;
+
+ snprintf(filename, sizeof filename, "%s/%s_dri.so",
+ real_dri_driver_path, driverName);
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 44f658f..8922414 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -458,8 +458,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->base.swapInterval = NULL;
screen->base.pScreen = pScreen;
+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH");
+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path;
+
snprintf(filename, sizeof filename,
- "%s/%s_dri.so", dri_driver_path, driverName);
+ "%s/%s_dri.so", real_dri_driver_path, driverName);
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {

2
pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
View File

@ -9,7 +9,7 @@ diff -rc xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c xorg-server-X11R7.2-1.2.0/
} }
+ char *xkbBinDir = getenv("XKB_BINDIR"); + char *xkbBinDir = getenv("XKB_BINDIR");
+ if (xkbBinDir) + if (xkbBinDir)
+ XkbBinDirectory = _XkbDupString(xkbBinDir); + XkbBinDirectory = Xstrdup(xkbBinDir);
return 0; return 0;
} }

2
pkgs/tools/admin/tigervnc/default.nix
View File

@ -6,8 +6,6 @@
, libxkbfile, libXfont, libpciaccess , libxkbfile, libXfont, libpciaccess
}: }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

6
pkgs/tools/networking/sitecopy/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }: { stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sitecopy-0.16.6"; name = "sitecopy-0.16.6";
@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
patches = [ ./neon-29.patch ]; patches = [ ./neon-29.patch ];
preConfigure = "autoreconf"; buildInputs = [ openssl neon zlib autoreconfHook ];
buildInputs = [ openssl neon zlib autoconf automake libtool ];
configureFlags= "--with-ssl=openssl"; configureFlags= "--with-ssl=openssl";
} }

11
pkgs/tools/system/pciutils/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, zlib }: { stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pciutils-3.1.7"; name = "pciutils-3.1.10";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
sha256 = "0i7mqf1fkmdqsawdk2badv6k3xrkryq0i2xknclvy6kcjsv27znq"; sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl";
}; };
buildInputs = [ zlib ]; buildInputs = [ zlib ];
pciids = fetchurl { pciids = fetchurl {
# Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
url = http://nixos.org/tarballs/pci.ids.20100714.bz2; url = http://nixos.org/tarballs/pci.ids.20120929.bz2;
sha256 = "0vll4svr60l6217yna7bfhcjm3prxr2b62ynq4jaagdp1rilfbap"; sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
}; };
# Override broken auto-detect logic. # Override broken auto-detect logic.
@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
installTargets = "install install-lib"; installTargets = "install install-lib";
# Get rid of update-pciids as it won't work.
postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8";
meta = { meta = {
homepage = http://mj.ucw.cz/pciutils.shtml; homepage = http://mj.ucw.cz/pciutils.shtml;
description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; description = "A collection of programs for inspecting and manipulating configuration of PCI devices";

56
pkgs/top-level/all-packages.nix
View File

@ -242,6 +242,10 @@ let
theAttrSet = arg; theAttrSet = arg;
}; };
autoreconfHook = makeSetupHook
{ substitutions = { inherit autoconf automake libtool; }; }
../build-support/setup-hooks/autoreconf.sh;
buildEnv = import ../build-support/buildenv { buildEnv = import ../build-support/buildenv {
inherit (pkgs) runCommand perl; inherit (pkgs) runCommand perl;
}; };
@ -324,7 +328,7 @@ let
inherit stdenv perl cpio contents ubootChooser; inherit stdenv perl cpio contents ubootChooser;
}; };
makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
makeModulesClosure = {kernel, rootModules, allowMissing ? false}: makeModulesClosure = {kernel, rootModules, allowMissing ? false}:
import ../build-support/kernel/modules-closure.nix { import ../build-support/kernel/modules-closure.nix {
@ -2746,21 +2750,7 @@ let
perl = if system != "i686-cygwin" then perl514 else sysPerl; perl = if system != "i686-cygwin" then perl514 else sysPerl;
php = php5_3; php = callPackage ../development/interpreters/php/5.3.nix { };
php5_2 = makeOverridable (import ../development/interpreters/php/5.2.nix) {
inherit
stdenv fetchurl lib composableDerivation autoconf automake
flex bison apacheHttpd mysql libxml2 readline
zlib curl gd postgresql openssl pkgconfig sqlite config libiconv libjpeg libpng;
};
php5_3 = makeOverridable (import ../development/interpreters/php/5.3.nix) {
inherit
stdenv fetchurl lib composableDerivation autoconf automake
flex bison apacheHttpd mysql libxml2 readline
zlib curl gd postgresql openssl pkgconfig sqlite config libiconv libjpeg libpng;
};
php_apc = callPackage ../development/libraries/php-apc { }; php_apc = callPackage ../development/libraries/php-apc { };
@ -3833,23 +3823,23 @@ let
gtkmm; gtkmm;
}; };
glib = callPackage ../development/libraries/glib/2.30.x.nix { }; glib = callPackage ../development/libraries/glib/2.34.x.nix { };
glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
glib_networking = callPackage ../development/libraries/glib-networking {}; glib_networking = callPackage ../development/libraries/glib-networking {};
atk = callPackage ../development/libraries/atk/2.2.x.nix { }; atk = callPackage ../development/libraries/atk/2.6.x.nix { };
atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
cairo = callPackage ../development/libraries/cairo { }; cairo = callPackage ../development/libraries/cairo { };
pango = callPackage ../development/libraries/pango/1.29.x.nix { }; pango = callPackage ../development/libraries/pango/1.30.x.nix { };
pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { };
gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
@ -3890,6 +3880,8 @@ let
# TODO : Add MIT Kerberos and let admin choose. # TODO : Add MIT Kerberos and let admin choose.
kerberos = heimdal; kerberos = heimdal;
harfbuzz = callPackage ../development/libraries/harfbuzz { };
hawknl = callPackage ../development/libraries/hawknl { }; hawknl = callPackage ../development/libraries/hawknl { };
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
@ -4980,7 +4972,7 @@ let
libjpeg libtiff libxml2 libxslt sqlite libjpeg libtiff libxml2 libxslt sqlite
icu cairo intltool automake libtool icu cairo intltool automake libtool
pkgconfig autoconf bison libproxy enchant pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue; python ruby which flex geoclue mesa;
inherit gstreamer gst_plugins_base gst_ffmpeg inherit gstreamer gst_plugins_base gst_ffmpeg
gst_plugins_good; gst_plugins_good;
inherit (xlibs) libXt renderproto libXrender kbproto; inherit (xlibs) libXt renderproto libXrender kbproto;
@ -5511,7 +5503,7 @@ let
inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa libxslt expat libdrm libpng zlib perl mesa
xkeyboard_config dbus libuuid openssl gperf m4 xkeyboard_config dbus libuuid openssl gperf m4
autoconf libtool xmlto asciidoc udev flex bison python; autoconf libtool xmlto asciidoc udev flex bison python mtdev;
automake = automake110x; automake = automake110x;
}); });
@ -5651,14 +5643,6 @@ let
gpm = callPackage ../servers/gpm { }; gpm = callPackage ../servers/gpm { };
hal = callPackage ../os-specific/linux/hal { };
halevt = callPackage ../os-specific/linux/hal/hal-evt.nix { };
hal_info = callPackage ../os-specific/linux/hal/info.nix { };
hal_info_synaptics = callPackage ../os-specific/linux/hal/synaptics.nix { };
hdparm = callPackage ../os-specific/linux/hdparm { }; hdparm = callPackage ../os-specific/linux/hdparm { };
hibernate = callPackage ../os-specific/linux/hibernate { }; hibernate = callPackage ../os-specific/linux/hibernate { };
@ -6083,9 +6067,7 @@ let
module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
mountall = callPackage ../os-specific/linux/mountall { mountall = callPackage ../os-specific/linux/mountall { };
automake = automake111x;
};
aggregateModules = modules: aggregateModules = modules:
import ../os-specific/linux/module-init-tools/aggregator.nix { import ../os-specific/linux/module-init-tools/aggregator.nix {
@ -8376,15 +8358,15 @@ let
kde4 = recurseIntoAttrs pkgs.kde47; kde4 = recurseIntoAttrs pkgs.kde47;
kde47 = kdePackagesFor pkgs.kde47 "4.7"; kde47 = kdePackagesFor (pkgs.kde47 // {boost = boost149;}) ../desktops/kde-4.7;
kde48 = kdePackagesFor pkgs.kde48 "4.8"; kde48 = kdePackagesFor (pkgs.kde48 // {boost = boost149;}) ../desktops/kde-4.8;
kdePackagesFor = self: version: kdePackagesFor = self: dir:
let callPackageOrig = callPackage; in let callPackageOrig = callPackage; in
let let
callPackage = newScope self; callPackage = newScope self;
kde4 = callPackageOrig (../desktops/kde- + version) { kde4 = callPackageOrig dir {
inherit callPackage callPackageOrig; inherit callPackage callPackageOrig;
}; };
in kde4 // { in kde4 // {

Some files were not shown because too many files have changed in this diff Show More