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

* Merge the x-updates branch.

Browse Source 
svn path=/nixpkgs/trunk/; revision=26330
This commit is contained in:
Eelco Dolstra 2011-03-15 18:29:27 +00:00
commit f208edd1a5
63 changed files with 1527 additions and 1185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/display-managers/slim/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}: {stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slim-1.3.1"; name = "slim-1.3.2";
src = fetchurl { src = fetchurl {
url = "http://download.berlios.de/slim/${name}.tar.gz"; url = "http://download.berlios.de/slim/${name}.tar.gz";
sha256 = "0xqgzvg6h1bd29140mcgg9r16vcmskz7zmym7i7jlz7x9c1a9mxc"; sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi";
}; };
patches = [ patches = [
@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
# Don't set PAM_RHOST to "localhost", it confuses ConsoleKit # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
# (which assumes that a non-empty string means a remote session). # (which assumes that a non-empty string means a remote session).
./pam2.patch ./pam2.patch
./slim-1.3.1-gcc4.4.patch
]; ];
buildInputs = [x11 libjpeg libpng libXmu freetype pam]; buildInputs = [x11 libjpeg libpng libXmu freetype pam];

17
pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch
View File

@ -1,17 +0,0 @@
Patch to allow compilation with gcc-4.4
Notified by Daniel J. - from Debian bug tracker
http://bugs.gentoo.org/252745
--- a/switchuser.h 2008-11-11 19:40:18.000000000 +0000
+++ a/switchuser.h 2008-11-11 19:40:28.000000000 +0000
@@ -18,6 +18,7 @@
#include <pwd.h>
#include <grp.h>
#include <paths.h>
+#include <cstdio>
#include <iostream>
#include "const.h"
#include "cfg.h"

10
pkgs/applications/editors/emacs-23/default.nix
View File

@ -17,10 +17,12 @@ stdenv.mkDerivation rec {
sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a"; sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a";
}; };
buildInputs = [ buildInputs =
ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf libtiff librsvg libXft gconf
]; ]
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
++ stdenv.lib.optional stdenv.isLinux dbus;
configureFlags = configureFlags =
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"] stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"]

11
pkgs/applications/graphics/xscreensaver/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchurl, pkgconfig, bc, perl, pam { stdenv, fetchurl, pkgconfig, bc, perl, pam
, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender , libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
, libXxf86misc , libXxf86misc
, libjpeg, mesa, gtk , libxml2, libglade}: , libjpeg, mesa, gtk, libxml2, libglade
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.12"; version = "5.12";
@ -15,16 +16,14 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam
libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender
libXxf86misc ]; libXxf86misc
];
configureFlags = configureFlags =
[ [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
"--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
"--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext" "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
"--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext" "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext"
"--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay" "--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay"
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
]; ];

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }: { stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xterm-231"; name = "xterm-268";
src = fetchurl { src = fetchurl {
url = "ftp://invisible-island.net/xterm/${name}.tgz"; url = "ftp://invisible-island.net/xterm/${name}.tgz";
sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr"; sha256 = "1hr886mgr74k146fjppnq1pmg6f95l00v88cfwac3rms5lx7ckap";
}; };
buildInputs = buildInputs =
@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
--enable-mini-luit --with-tty-group=tty --enable-mini-luit --with-tty-group=tty
''; '';
# Work around broken "plink.sh".
NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11";
# 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
# If we used the configure option, that would have affected the xterm installation, # If we used the configure option, that would have affected the xterm installation,

2
pkgs/applications/networking/browsers/firefox/3.6.nix
View File

@ -97,6 +97,8 @@ rec {
rm -f $out/bin/run-mozilla.sh rm -f $out/bin/run-mozilla.sh
''; # */ ''; # */
enableParallelBuilding = true;
meta = { meta = {
description = "Mozilla Firefox XUL runner"; description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/; homepage = http://www.mozilla.com/en-US/firefox/;

3
pkgs/applications/office/openoffice/default.nix
View File

@ -7,6 +7,7 @@
}: }:
let version = "3.2.1"; in let version = "3.2.1"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openoffice.org-${version}"; name = "openoffice.org-${version}";
builder = ./builder.sh; builder = ./builder.sh;
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i";
}; };
patches = [ ./oo.patch ./root-required.patch ]; patches = [ ./oo.patch ./root-required.patch ./xlib.patch ];
postPatch = postPatch =
/* Compiling with GCC 4.5 fails: /* Compiling with GCC 4.5 fails:

5
pkgs/applications/office/openoffice/go-oo.nix
View File

@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
done done
sed '/-x $WGET/d' -i download sed '/-x $WGET/d' -i download
./download ./download
# Needed to find genccode # Needed to find genccode
PATH=$PATH:${icu}/sbin PATH=$PATH:${icu}/sbin
@ -53,6 +54,9 @@ stdenv.mkDerivation rec {
set -x set -x
pushd build/${tag} pushd build/${tag}
patch -p1 < ${./xlib.patch}
# Fix svtools: hardcoded jpeg path # Fix svtools: hardcoded jpeg path
sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk
# Fix sysui: wants to create a tar for root # Fix sysui: wants to create a tar for root
@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
# Fix redland: wants to set rpath to /usr/local/lib # Fix redland: wants to set rpath to /usr/local/lib
sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \ sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \
redland/raptor/makefile.mk redland/rasqal/makefile.mk redland/raptor/makefile.mk redland/rasqal/makefile.mk
popd popd
set +x set +x

22
pkgs/applications/office/openoffice/xlib.patch Normal file
View File

@ -0,0 +1,22 @@
https://bugs.freedesktop.org/show_bug.cgi?id=31322
diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx
*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200
--- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100
***************
*** 36,42 ****
class SalDisplay;
class AllSettings;
! #ifndef _XLIB_H_
// forwards from X
struct Display;
struct XEvent;
--- 36,42 ----
class SalDisplay;
class AllSettings;
! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
// forwards from X
struct Display;
struct XEvent;

3
pkgs/applications/window-managers/compiz/core.nix
View File

@ -16,6 +16,9 @@ stdenv.mkDerivation {
# directories to be overriden through $COMPIZ_PLUGINDIR and # directories to be overriden through $COMPIZ_PLUGINDIR and
# $COMPIZ_METADATADIR, respectively. # $COMPIZ_METADATADIR, respectively.
./plugindir-core.patch ./plugindir-core.patch
# Fix compilation with recent GTK versions.
./gdk-deprecated.patch
]; ];
buildInputs = buildInputs =

14
pkgs/applications/window-managers/compiz/gdk-deprecated.patch Normal file
View File

@ -0,0 +1,14 @@
diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c
--- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100
@@ -31,10 +31,6 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xregion.h>
-#ifndef GDK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATED
-#endif
-
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_DISABLE_DEPRECATED
#endif

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib, xlibs, automake, pkgconfig, { stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib
gtk }: , xlibs, automake, pkgconfig, gtk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icewm-1.3.6"; name = "icewm-1.3.6";
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "1pr7rc10rddwvy4ncng4mf5fpxd1nqjsw34xba9ngsg32rg57b91"; sha256 = "1pr7rc10rddwvy4ncng4mf5fpxd1nqjsw34xba9ngsg32rg57b91";
}; };
NIX_LDFLAGS = "-lfontconfig";
# The fuloong2f is not supported by 1.3.6 still # The fuloong2f is not supported by 1.3.6 still
preConfigure = '' preConfigure = ''
cp ${automake}/share/automake*/config.{sub,guess} . cp ${automake}/share/automake*/config.{sub,guess} .

6
pkgs/applications/window-managers/ratpoison/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig { stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig, freetype
, libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }: , libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
preConfigure = "autoreconf -vf"; # needed because of the patch above preConfigure = "autoreconf -vf"; # needed because of the patch above
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh
buildInputs = buildInputs =
[ libX11 inputproto libXt libXpm libXft fontconfig libXtst [ libX11 inputproto libXt libXpm libXft fontconfig freetype libXtst
xextproto readline libXi pkgconfig perl autoconf automake xextproto readline libXi pkgconfig perl autoconf automake
]; ];

7
pkgs/desktops/kde-4.5/base-workspace/default.nix
View File

@ -15,6 +15,13 @@ kde.package {
strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate
pciutils bluez networkmanager ]; pciutils bluez networkmanager ];
patches =
[ # Don't do compositing with the software GLX driver, since it's
# completely broken (corrupt output, server crashes, etc.).
# (NixOS/121)
./no-software-compositing.patch
];
meta = { meta = {
description = "KDE base platform-specific components"; description = "KDE base platform-specific components";
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";

17
pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch Normal file
View File

@ -0,0 +1,17 @@
diff -ru -x '*~' kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp kdebase-workspace-4.5.5/kwin/compositingprefs.cpp
--- kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp 2010-06-24 18:28:18.000000000 +0200
+++ kdebase-workspace-4.5.5/kwin/compositingprefs.cpp 2011-03-11 16:33:07.296566718 +0100
@@ -314,9 +314,10 @@
//else if( mDriver == "radeon" )
// {
// }
- //else if( mDriver == "software" )
- // {
- // }
+ else if( mDriver == "software" )
+ {
+ mRecommendCompositing = false;
+ }
}

2
pkgs/desktops/kde-4.5/kde-package/default.nix
View File

@ -19,6 +19,8 @@ rec {
).sha256; ).sha256;
}; };
enableParallelBuilding = true;
meta = { meta = {
maintainers = with stdenv.lib.maintainers; [ sander urkud ]; maintainers = with stdenv.lib.maintainers; [ sander urkud ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;

12
pkgs/development/libraries/atk/1.28.x.nix → pkgs/development/libraries/atk/1.32.x.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }: { stdenv, fetchurl, pkgconfig, perl, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atk-1.28.0"; name = "atk-1.32.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/atk/1.28/${name}.tar.bz2"; url = "mirror://gnome/sources/atk/1.32/${name}.tar.bz2";
sha256 = "11zyamivv7fcj9ap3w3bn3gm89mkni9waf51fx75zmfjh3jrznp4"; sha256 = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e";
}; };
buildInputs = [pkgconfig perl]; buildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [glib]; propagatedBuildInputs = [ glib ];
postInstall = "rm -rf $out/share/gtk-doc";
meta = { meta = {
description = "ATK, the accessibility toolkit"; description = "ATK, the accessibility toolkit";

60
pkgs/development/libraries/cairo/1.10.nix
View File

@ -1,60 +0,0 @@
{ postscriptSupport ? true
, pdfSupport ? true
, pngSupport ? true
, xcbSupport ? false
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
}:
assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null;
stdenv.mkDerivation rec {
name = "cairo-1.10.0";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz";
sha256 = "1cllxp8rx5zxkfpn36ysqg1kqz5d1cvbbf2fsy440n8m8v6f8b0g";
};
buildInputs =
[ pkgconfig x11 fontconfig pixman ] ++
stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
propagatedBuildInputs =
[ freetype ] ++
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
configureFlags =
stdenv.lib.optional xcbSupport "--enable-xcb" ++
stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = ''
# Work around broken `Requires.private' that prevents Freetype
# `-I' flags to be propagated.
sed -i "src/cairo.pc.in" \
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
'';
meta = {
description = "A 2D graphics library with support for multiple output devices";
longDescription = ''
Cairo is a 2D graphics library with support for multiple output
devices. Currently supported output targets include the X
Window System, Quartz, Win32, image buffers, PostScript, PDF,
and SVG file output. Experimental backends include OpenGL
(through glitz), XCB, BeOS, OS/2, and DirectFB.
Cairo is designed to produce consistent output on all output
media while taking advantage of display hardware acceleration
when available (e.g., through the X Render Extension).
'';
homepage = http://cairographics.org/;
licenses = [ "LGPLv2+" "MPLv1" ];
};
}

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

@ -2,7 +2,7 @@
, pdfSupport ? true , pdfSupport ? true
, pngSupport ? true , pngSupport ? true
, xcbSupport ? false , xcbSupport ? false
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null , zlib, libpng, pixman, libxcb ? null, xcbutil ? null
}: }:
@ -11,15 +11,15 @@ 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.8.10"; name = "cairo-1.10.2";
src = fetchurl { src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz"; url = "http://cairographics.org/releases/${name}.tar.gz";
sha1 = "fd5e8ca82ff0e8542ea4c51612cad387f2a49df3"; sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e";
}; };
buildInputs = buildInputs =
[ pkgconfig x11 fontconfig pixman ] ++ [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++
stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]; stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
propagatedBuildInputs = propagatedBuildInputs =
@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
stdenv.lib.optional pngSupport libpng; stdenv.lib.optional pngSupport libpng;
configureFlags = configureFlags =
stdenv.lib.optional xcbSupport "--enable-xcb" ++ [ "--enable-tee" ]
stdenv.lib.optional pdfSupport "--enable-pdf"; ++ stdenv.lib.optional xcbSupport "--enable-xcb"
++ stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = '' preConfigure = ''
# Work around broken `Requires.private' that prevents Freetype # Work around broken `Requires.private' that prevents Freetype
@ -38,6 +39,9 @@ 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'
''; '';
# The default `--disable-gtk-doc' is ignored.
postInstall = "rm -rf $out/share/gtk-doc";
meta = { meta = {
description = "A 2D graphics library with support for multiple output devices"; description = "A 2D graphics library with support for multiple output devices";

6
pkgs/development/libraries/clutter-gtk/default.nix
View File

@ -1,17 +1,19 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk }: { fetchurl, stdenv, pkgconfig, clutter, gtk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clutter-gtk-0.10.4"; name = "clutter-gtk-0.10.8";
src = fetchurl { src = fetchurl {
url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2"; url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";
sha256 = "04mrq5ddj24zhh7dvyp9bl8510wq7qpmy3rl3wiqwl9c43gahd01"; sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
}; };
buildInputs = [ pkgconfig clutter gtk ]; buildInputs = [ pkgconfig clutter gtk ];
preConfigure = "export V=1"; preConfigure = "export V=1";
postBuild = "rm -rf $out/share/gtk-doc";
meta = { meta = {
description = "Clutter-GTK"; description = "Clutter-GTK";

5
pkgs/development/libraries/clutter/default.nix
View File

@ -2,11 +2,11 @@
, libXcomposite, cairo, glib, pango, gtk, json_glib }: , libXcomposite, cairo, glib, pango, gtk, json_glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clutter-1.4.0"; name = "clutter-1.4.2";
src = fetchurl { src = fetchurl {
url = "http://source.clutter-project.org/sources/clutter/1.4/${name}.tar.bz2"; url = "http://source.clutter-project.org/sources/clutter/1.4/${name}.tar.bz2";
sha256 = "15icq2gf2fi098lq1wqr7sq2cnb00g1ids050a5z3f43l1ajrnxw"; sha256 = "14l8wgk5jdwsnjf991qgzl115kjs1xywil2awlrwj1airsn6gzcj";
}; };
buildInputs = [ pkgconfig ]; buildInputs = [ pkgconfig ];
@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
libXi libXfixes libXdamage libXcomposite libXi libXfixes libXdamage libXcomposite
]; ];
meta = { meta = {
description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; description = "Clutter, a library for creating fast, dynamic graphical user interfaces";

4
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.2.24"; version = "1.4.6";
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 = "0j2wb79kndq4b1qqr59n1g6s0lm7yp6r9ny3skimadkh9a7p8b7i"; sha256 = "0rx5p1f0jg4ch4958qb3ld3w3cw57a0rmvmxjgn1ir9dvxj1wgkm";
}; };
patches = [ ./ignore-missing-includedirs.patch ]; patches = [ ./ignore-missing-includedirs.patch ];

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

@ -0,0 +1,18 @@
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,7 +1,17 @@
{stdenv, fetchurl}: stdenv.mkDerivation { { stdenv, fetchurl }:
stdenv.mkDerivation {
name = "expat-2.0.1"; name = "expat-2.0.1";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/expat/expat-2.0.1.tar.gz; url = mirror://sourceforge/expat/expat-2.0.1.tar.gz;
sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4"; sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4";
}; };
patches = [ ./cve-2009-3560.patch ];
meta = {
homepage = http://expat.sourceforge.net/;
description = "A stream-oriented XML parser library written in C";
};
} }

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

@ -6,11 +6,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freetype-2.4.1"; name = "freetype-2.4.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/freetype/${name}.tar.bz2"; url = "mirror://sourceforge/freetype/${name}.tar.bz2";
sha256 = "0gmyk6w7rbiiw7zjbyvkvp8wfl7q9n5576ifqq67qwsjdzlm9ja5"; sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb";
}; };
configureFlags = "--disable-static"; configureFlags = "--disable-static";

24
pkgs/development/libraries/gdk-pixbuf/2.22.x.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs }:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.22.1";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/2.22/${name}.tar.bz2";
sha256 = "6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d";
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
buildInputs = [ pkgconfig glib libtiff libjpeg libpng xlibs.xlibs ];
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
description = "A library for image loading and manipulation";
homepage = http://library.gnome.org/devel/gdk-pixbuf/;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
};
}

13
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -1,13 +0,0 @@
{stdenv, fetchurl, gtk, libtiff, libjpeg, libpng}:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-0.22.0";
src = fetchurl {
url = "ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/${name}.tar.bz2";
md5 = "05fcb68ceaa338614ab650c775efc2f2";
};
buildInputs = [libtiff libjpeg libpng];
propagatedBuildInputs = [gtk];
}

36
pkgs/development/libraries/glib/2.22.x.nix
View File

@ -1,36 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv}:
stdenv.mkDerivation rec {
name = "glib-2.22.5";
src = fetchurl {
url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2";
sha256 = "802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b";
};
buildInputs = [pkgconfig gettext perl]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
# The nbd package depends on a static version of this library; hence
# the default configure flag --disable-static is switched off.
dontDisableStatic = true;
configureFlags = "--enable-static --enable-shared";
meta = {
description = "GLib, a C library of programming buildings blocks";
longDescription = ''
GLib provides the core application building blocks for libraries
and applications written in C. It provides the core object
system used in GNOME, the main loop implementation, and a large
set of utility functions for strings and common data structures.
'';
homepage = http://www.gtk.org/;
license = "LGPLv2+";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/glib/2.24.x.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }: { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glib-2.24.1"; name = "glib-2.24.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/2.24/${name}.tar.bz2"; url = "mirror://gnome/sources/glib/2.24/${name}.tar.bz2";
sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04"; sha256 = "030nl16xa2ps9bklm2l81w0yamsrj5a0x7rp4h9dshinpld55srs";
}; };
buildInputs = [ pkgconfig gettext ] buildInputs = [ pkgconfig gettext ]

10
pkgs/development/libraries/glib/2.28.x.nix
View File

@ -1,19 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }: { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glib-2.28.1"; name = "glib-2.28.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/2.28/${name}.tar.bz2"; url = "mirror://gnome/sources/glib/2.28/${name}.tar.bz2";
sha256 = "1b85b998909202c07c2def66613ae6736aac48d7a0a7c98f98967b936fe9de22"; sha256 = "7e1ab62d0f0cdc3f0ce8214b77d104b3abbd51185a9f3fc9b6a504cce26f6fab";
}; };
# configure script looks for d-bus but it is only needed for tests
buildInputs = [ pkgconfig gettext ] buildInputs = [ pkgconfig gettext ]
++ stdenv.lib.optional (!stdenv.isLinux) libiconv; ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
buildNativeInputs = [ perl ]; buildNativeInputs = [ perl ];
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
# glib buildsystem fails to find python, thus hardcodes python2.4 in #!
postInstall = ''
rm -rvf $out/share/gtk-doc
sed -e 's@python2\.4@python@' -i $out/bin/gtester-report'';
meta = { meta = {
description = "GLib, a C library of programming buildings blocks"; description = "GLib, a C library of programming buildings blocks";

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, zlib }: { stdenv, fetchurl, pkgconfig, glib, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gmime-2.4.17"; name = "gmime-2.4.22";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz"; url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz";
sha256 = "1l1pbk0yrr7zwl90aabdhw0f9i4m6ragsfyk5qwg0hzk21abz9wd"; sha256 = "0s93amrj7fh3p8lv770p7mrml07m6dps6srwi1wn76d2rfb944xn";
}; };
buildInputs = [ pkgconfig glib zlib ]; buildInputs = [ pkgconfig glib zlib ];

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

@ -1,22 +1,27 @@
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, cairo }: { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }:
let let
baseName = "gobject-introspection"; baseName = "gobject-introspection";
v = "0.6.10"; v = "0.10.2";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${baseName}-${v}"; name = "${baseName}-${v}";
buildInputs = [ flex bison glib pkgconfig python cairo ]; buildInputs = [ flex bison glib pkgconfig python ];
propagatedBuildInputs = [ libffi ]; propagatedBuildInputs = [ libffi ];
configureFlags = "--enable-gcov";
# Tests depend on cairo, which is undesirable (it pulls in lots of
# other dependencies).
configureFlags = "--disable-tests";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${baseName}/0.6/${name}.tar.bz2"; url = "mirror://gnome/sources/${baseName}/0.10/${name}.tar.bz2";
sha256 = "0jwd7bybgvg6dwhg64da8k9yjrs37y5p153gaaapz5j59ld53g9n"; sha256 = "18di6v39hibb6j39vs0a5icaafihfryh8250kz7x1q1313pvm62v";
}; };
postInstall = "rm -rf $out/share/gtk-doc";
meta = with stdenv.lib; { meta = with stdenv.lib; {
maintainers = [ maintainers.urkud ]; maintainers = [ maintainers.urkud ];
platforms = platforms.linux; platforms = platforms.linux;

2
pkgs/development/libraries/gtk+/2.20.x.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig jasper ]; buildInputs = [ pkgconfig jasper ];
propagatedBuildInputs = propagatedBuildInputs =
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr xlibs.libXrender ]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ]; ++ stdenv.lib.optionals cupsSupport [ cups ];

24
pkgs/development/libraries/gtk+/2.18.x.nix → pkgs/development/libraries/gtk+/2.24.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg { stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg
, libpng, cairo, perl, jasper, xlibs , libpng, cairo, perl, jasper, xlibs, gdk_pixbuf
, xineramaSupport ? true , xineramaSupport ? true
, cupsSupport ? true, cups ? null , cupsSupport ? true, cups ? null
}: }:
@ -8,21 +8,35 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtk+-2.18.9"; name = "gtk+-2.24.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2"; url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.bz2";
sha256 = "5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4"; sha256 = "336ddf3dd342cc36bee80dd4f86ef036044a2deb10cda67c8eecf5315b279ef7";
}; };
patches =
[ # Fix broken icons such as the back/forward buttons in Firefox.
# http://bugs.gentoo.org/339319
./old-icons.patch
];
enableParallelBuilding = true;
buildNativeInputs = [ perl ]; buildNativeInputs = [ perl ];
buildInputs = [ pkgconfig jasper ]; buildInputs = [ pkgconfig jasper ];
propagatedBuildInputs = propagatedBuildInputs =
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] [ xlibs.xlibs glib atk pango gdk_pixbuf /* libtiff libjpeg libpng */ cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ]; ++ stdenv.lib.optionals cupsSupport [ cups ];
configureFlags = "--with-xinput=yes";
postInstall = "rm -rf $out/share/gtk-doc";
passthru = { inherit libtiff libjpeg libpng; }; passthru = { inherit libtiff libjpeg libpng; };
meta = { meta = {

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

@ -0,0 +1,270 @@
diff -ru -x '*~' gtk+-2.24.0-orig//gtk/Makefile.in gtk+-2.24.0//gtk/Makefile.in
--- gtk+-2.24.0-orig//gtk/Makefile.in 2011-01-30 05:39:20.000000000 +0100
+++ gtk+-2.24.0//gtk/Makefile.in 2011-02-14 00:06:56.000000000 +0100
@@ -1601,7 +1601,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
@@ -2873,7 +3039,91 @@
&& $(LN_S) folder.png user-desktop.png \
&& $(RM) text-x-generic.png \
&& $(LN_S) document-x-generic.png text-x-generic.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

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

@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, libpthreadstubs}: {stdenv, fetchurl, pkgconfig, libpthreadstubs}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdrm-2.4.22"; name = "libdrm-2.4.24";
src = fetchurl { src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "0gbb7i282i6gf2wzbzkcz5j662v4ixpfjf0gv0090k89wjafbc0b"; sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7";
}; };
buildInputs = [ pkgconfig libpthreadstubs ]; buildInputs = [ pkgconfig libpthreadstubs ];

2
pkgs/development/libraries/libjpeg/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libjpeg-8"; name = "libjpeg-8c";
src = fetchurl { src = fetchurl {
url = http://www.ijg.org/files/jpegsrc.v8c.tar.gz; url = http://www.ijg.org/files/jpegsrc.v8c.tar.gz;

36
pkgs/development/libraries/mesa/7.9.nix
View File

@ -1,36 +0,0 @@
{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null,
talloc, python, libxml2, libxml2Python}:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
stdenv.mkDerivation rec {
version = "7.9";
name = "mesa-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
sha256 = "1wr927mdghn7w1cmp0bxswjda5s2x0hwfpf8zcc9x03da7s6gkg0";
};
configureFlags =
"--disable-gallium"
+ (if stdenv.system == "mips64-linux" then
" --with-dri-drivers=swrast --with-driver=dri" else "")
+ (if stdenv.isDarwin then " --disable-egl" else "");
buildInputs =
[ pkgconfig expat x11 libdrm xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
lipo talloc python libxml2 libxml2Python
];
passthru = { inherit libdrm; };
meta = {
description = "An open source implementation of OpenGL";
homepage = http://www.mesa3d.org/;
license = "bsd";
};
}

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

@ -1,29 +1,35 @@
{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null }: { stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null, talloc }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then 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.10.1"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mesa-7.8.2"; name = "mesa-${version}";
src = fetchurl { src = fetchurl {
url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2; url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
md5 = "6be2d343a0089bfd395ce02aaf8adb57"; md5 = "efe8da4d80c2a5d32a800770b8ce5dfa";
}; };
patches = [ ./swrast-settexbuffer.patch ];
configureFlags = configureFlags =
"--disable-gallium" "--disable-gallium"
+ (if stdenv.system == "mips64-linux" then + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
" --with-dri-drivers=swrast --with-driver=dri" else "") " --with-dri-drivers=swrast --with-driver=dri"
+ (if stdenv.isDarwin then " --disable-egl" else ""); + stdenv.lib.optionalString stdenv.isDarwin " --disable-egl";
buildInputs = buildInputs =
[ pkgconfig expat x11 libdrm xlibs.glproto [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
lipo lipo talloc
]; ];
enableParallelBuilding = true;
passthru = { inherit libdrm; }; passthru = { inherit libdrm; };
meta = { meta = {

24
pkgs/development/libraries/mesa/swrast-settexbuffer.patch Normal file
View File

@ -0,0 +1,24 @@
https://build.opensuse.org/package/view_file?file=0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch&package=Mesa&project=openSUSE%3AFactory&srcmd5=be25d34ad69853c2bb21ed376061d573
diff -ru Mesa-7.10.1-orig//src/mesa/drivers/dri/swrast/swrast.c Mesa-7.10.1//src/mesa/drivers/dri/swrast/swrast.c
--- Mesa-7.10.1-orig//src/mesa/drivers/dri/swrast/swrast.c 2010-12-14 22:43:15.000000000 +0100
+++ Mesa-7.10.1//src/mesa/drivers/dri/swrast/swrast.c 2011-03-07 18:08:17.062816112 +0100
@@ -61,6 +61,7 @@
static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
GLint texture_format, __DRIdrawable *dPriv)
{
+ GET_CURRENT_CONTEXT(ctx);
struct dri_context *dri_ctx;
int x, y, w, h;
__DRIscreen *sPriv = dPriv->driScreenPriv;
@@ -90,6 +91,10 @@
_mesa_init_teximage_fields(&dri_ctx->Base, target, texImage,
w, h, 1, 0, internalFormat, texFormat);
+ ctx->Driver.TexImage2D(ctx, target, 0, internalFormat,
+ w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8,
+ NULL, &ctx->Unpack, texObj, texImage);
+
sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data,
dPriv->loaderPrivate);

13
pkgs/development/libraries/openssl/default.nix
View File

@ -7,11 +7,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "openssl-1.0.0c"; name = "openssl-1.0.0d";
src = fetchurl { src = fetchurl {
url = "http://www.openssl.org/source/${name}.tar.gz"; url = "http://www.openssl.org/source/${name}.tar.gz";
sha256 = "1sq4sswyjxnr08lyjcafwdha6j5jd2b48vxfg48kdapdwdnv6cgp"; sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj";
}; };
patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
@ -25,6 +25,15 @@ stdenv.mkDerivation rec {
configureFlags = "shared --libdir=lib"; configureFlags = "shared --libdir=lib";
postInstall =
''
# If we're building dynamic libraries, then don't install static
# libraries.
if [ -n "$(echo $out/lib/*.so)" ]; then
rm $out/lib/*.a
fi
''; # */
crossAttrs = { crossAttrs = {
preConfigure='' preConfigure=''
# It's configure does not like --build or --host # It's configure does not like --build or --host

32
pkgs/development/libraries/pango/1.26.x.nix
View File

@ -1,32 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
stdenv.mkDerivation rec {
name = "pango-1.26.2";
src = fetchurl {
url = "mirror://gnome/sources/pango/1.26/${name}.tar.bz2";
sha256 = "021ygk3l9bk00gsvxk02flxsk68w0wl99dx221fmb547bng8g19v";
};
buildInputs = [pkgconfig] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext;
propagatedBuildInputs = [x11 glib cairo libpng];
meta = {
description = "A library for laying out and rendering of text, with an emphasis on internationalization";
longDescription = ''
Pango is a library for laying out and rendering of text, with an
emphasis on internationalization. Pango can be used anywhere
that text layout is needed, though most of the work on Pango so
far has been done in the context of the GTK+ widget toolkit.
Pango forms the core of text and font handling for GTK+-2.x.
'';
homepage = http://www.pango.org/;
license = "LGPLv2+";
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/development/libraries/pango/1.28.x.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ x11 glib cairo libpng ]; propagatedBuildInputs = [ x11 glib cairo libpng ];
postInstall = "rm -rf $out/share/gtk-doc";
meta = { meta = {
description = "A library for laying out and rendering of text, with an emphasis on internationalization"; description = "A library for laying out and rendering of text, with an emphasis on internationalization";

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

@ -13,11 +13,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "polkit-0.96"; name = "polkit-0.99";
src = fetchurl { src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "0jh5v0dhf9msvmfmr9d67563m64gq5l96m9jax9abchhfa8wl9il"; sha256 = "0gsqnc5x6angma7paw0hnl5cagqimsj5f022a5vzc8n8dv1cf4pn";
}; };
buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext

5
pkgs/development/libraries/talloc/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv}: { fetchurl, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "talloc-2.0.1"; name = "talloc-2.0.1";
@ -9,12 +9,11 @@ stdenv.mkDerivation rec {
}; };
configureFlags = "--enable-talloc-compat1 --enable-largefile"; configureFlags = "--enable-talloc-compat1 --enable-largefile";
meta = { meta = {
description = "talloc is a hierarchical pool based memory allocator with destructors"; description = "talloc is a hierarchical pool based memory allocator with destructors";
homepage = http://tdb.samba.org/; homepage = http://tdb.samba.org/;
license = "GPLv3"; license = "GPLv3";
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} }

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
, dbus, libusb, acl }: , dbus, libusb, acl }:
let version = "1.4.5"; in let version = "1.4.6"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cups-${version}"; name = "cups-${version}";
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 = "1zhf3hvx11i0qnbwyybmdhx4fxkxfd4ch69k59fj5bz8wvcdcl04"; sha256 = "056mdbz0g1jjihk03xjyp4f1bxl2aksf2vzra1qjrdbp59q131zh";
}; };
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ]; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ];

4
pkgs/misc/emulators/gens-gs/default.nix
View File

@ -10,6 +10,10 @@ stdenv.mkDerivation {
buildInputs = [ pkgconfig gtkLibs.gtk SDL nasm zlib libpng mesa ]; buildInputs = [ pkgconfig gtkLibs.gtk SDL nasm zlib libpng mesa ];
# Work around build failures on recent GTK+.
# See http://ubuntuforums.org/showthread.php?p=10535837
NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE";
meta = { meta = {
homepage = http://segaretro.org/Gens/GS; homepage = http://segaretro.org/Gens/GS;
description = "A Genesis/Mega Drive emulator"; description = "A Genesis/Mega Drive emulator";

8
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -7,7 +7,7 @@
with stdenv.lib; with stdenv.lib;
let versionNumber = "260.19.36"; in let versionNumber = "260.19.44"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@ -18,12 +18,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "0vfcfvn59qg53kqkij83pidssfnafd720hrx62cm7jmqzp5vgyvc"; sha256 = "06sp7wi1q2sh00r0nm340zpfjhngf4qifflbnk2ai88gb6zrpi54";
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "18wqfnmaiz0smf9xbzc3389nwz5lhisq8330bi0z9skwfjlpai2f"; sha256 = "0hqp56sf61wc9fn3zdvc0lr8w170p36mmf9irgpz0g96qwnic2z9";
} }
else throw "nvidia-x11 does not support platform ${stdenv.system}"; else throw "nvidia-x11 does not support platform ${stdenv.system}";
@ -38,7 +38,7 @@ stdenv.mkDerivation {
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib xlibs.libXv ] ); [ gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib gtkLibs.gdk_pixbuf xlibs.libXv ] );
buildInputs = [ perl ]; buildInputs = [ perl ];

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

@ -4,11 +4,11 @@
assert stdenv ? glibc; assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "udev-160"; name = "udev-166";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
sha256 = "0wx43bxiff8i80k7w3j2iszksdzw1hz6sanx8cjsiypgppi4fr12"; sha256 = "1msl8cwf47shmz5lr2w9w3nzzxqnf5dc0bs7dvbnxmbal60p7lpm";
}; };
buildInputs = [ gperf pkgconfig glib acl libusb usbutils ]; buildInputs = [ gperf pkgconfig glib acl libusb usbutils ];
@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
sed -e '/PATH=/d' -i $out/libexec/rule_generator.functions sed -e '/PATH=/d' -i $out/libexec/rule_generator.functions
ln -s $out/lib/ConsoleKit $out/etc/ConsoleKit ln -s $out/lib/ConsoleKit $out/etc/ConsoleKit
rm -rf $out/share/gtk-doc
''; '';
meta = { meta = {

5
pkgs/servers/x11/xorg/builder.sh
View File

@ -38,7 +38,7 @@ postInstall() {
} }
installFlags="appdefaultdir=$out/share/X11/app-defaults" installFlags="appdefaultdir=$out/share/X11/app-defaults $installFlags"
if test -n "$x11BuildHook"; then if test -n "$x11BuildHook"; then
@ -46,4 +46,7 @@ if test -n "$x11BuildHook"; then
fi fi
enableParallelBuilding=1
genericBuild genericBuild

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

File diff suppressed because it is too large Load Diff

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

@ -1,5 +1,2 @@
http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2 mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2 mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.6.tar.bz2
http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
mirror://xorg/individual/lib/pixman-0.18.2.tar.bz2

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

@ -25,8 +25,10 @@ my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "m
$pcMap{$_} = $_ foreach @missingPCs; $pcMap{$_} = $_ foreach @missingPCs;
$pcMap{"freetype2"} = "freetype"; $pcMap{"freetype2"} = "freetype";
$pcMap{"libpng12"} = "libpng"; $pcMap{"libpng12"} = "libpng";
$pcMap{"libpng"} = "libpng";
$pcMap{"dbus-1"} = "dbus"; $pcMap{"dbus-1"} = "dbus";
$pcMap{"uuid"} = "libuuid"; $pcMap{"uuid"} = "libuuid";
$pcMap{"libudev"} = "udev";
$pcMap{"gl"} = "mesa"; $pcMap{"gl"} = "mesa";
$pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "renderproto"; $pcMap{"\$RENDERPROTO"} = "renderproto";

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

@ -1,15 +1,15 @@
mirror://xorg/individual/app/twm-1.0.4.tar.bz2 mirror://xorg/individual/app/twm-1.0.6.tar.bz2
mirror://xorg/individual/app/xclock-1.0.4.tar.bz2 mirror://xorg/individual/app/xclock-1.0.5.tar.bz2
mirror://xorg/individual/app/xdm-1.1.10.tar.bz2 mirror://xorg/individual/app/xdm-1.1.10.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.0.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
mirror://xorg/individual/app/xfs-1.1.0.tar.bz2 mirror://xorg/individual/app/xfs-1.1.1.tar.bz2
mirror://xorg/individual/app/xinit-1.2.1.tar.bz2 mirror://xorg/individual/app/xinit-1.3.0.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.0.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.2.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
mirror://xorg/individual/proto/printproto-1.0.4.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.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.4.tar.bz2
mirror://xorg/individual/util/lndir-1.0.1.tar.bz2 mirror://xorg/individual/util/lndir-1.0.2.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2

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

@ -49,6 +49,11 @@ in
libX11 = attrs: attrs // { libX11 = attrs: attrs // {
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
postInstall =
''
# Remove useless DocBook XML files.
rm -rf $out/share/doc
'';
}; };
libXrender = attrs: attrs // { libXrender = attrs: attrs // {
@ -63,13 +68,30 @@ in
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
}; };
# Propagate some build inputs because of header file dependencies.
# Note: most of these are in Requires.private, so maybe builder.sh
# should propagate them automatically.
libXt = attrs: attrs // { libXt = attrs: attrs // {
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
propagatedBuildInputs = [ xorg.libSM ];
};
compositeproto = attrs: attrs // {
propagatedBuildInputs = [ xorg.fixesproto ];
};
libXcomposite = attrs: attrs // {
propagatedBuildInputs = [ xorg.libXfixes ];
};
libXaw = attrs: attrs // {
propagatedBuildInputs = [ xorg.libXmu ];
}; };
libXft = attrs: attrs // { libXft = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.libX11 buildInputs = attrs.buildInputs ++
xorg.renderproto ]; [ xorg.xproto xorg.libX11 xorg.renderproto ];
propagatedBuildInputs = [ xorg.libXrender ];
preConfigure = setMalloc0ReturnsNullCrossCompiling; preConfigure = setMalloc0ReturnsNullCrossCompiling;
}; };
@ -91,13 +113,13 @@ in
}; };
xf86inputevdev = attrs: attrs // { xf86inputevdev = attrs: attrs // {
configureFlags = "--with-sdkdir=\${out}/include/xorg";
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]; buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto];
installFlags = "sdkdir=\${out}/include/xorg";
}; };
xf86inputsynaptics = attrs: attrs // { xf86inputsynaptics = attrs: attrs // {
makeFlags = "sdkdir=\${out}/include/xorg"; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
}; };
xf86videointel = attrs: attrs // { xf86videointel = attrs: attrs // {
@ -135,15 +157,17 @@ in
xorgserver = attrs: attrs // { xorgserver = attrs: attrs // {
patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
buildInputs = attrs.buildInputs ++ buildInputs = attrs.buildInputs ++
[ args.zlib args.udev args.mesa [ args.zlib args.udev args.mesa args.dbus.libs
xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto
xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.xineramaproto xorg.xf86dgaproto
xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
xorg.recordproto xorg.libXext xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont
]; ];
propagatedBuildInputs = propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ]; [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
xorg.dri2proto xorg.kbproto
];
postInstall = postInstall =
'' ''
rm -fr $out/share/X11/xkb/compiled rm -fr $out/share/X11/xkb/compiled

197
pkgs/servers/x11/xorg/tarballs-7.5.list
View File

@ -1,197 +0,0 @@
mirror://xorg/X11R7.5/src/everything/applewmproto-1.4.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/bdftopcf-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/bigreqsproto-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/compositeproto-0.4.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/damageproto-1.2.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/dmxproto-2.3.tar.bz2
mirror://xorg/individual/proto/dri2proto-2.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/encodings-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/fixesproto-4.1.1.tar.bz2
mirror://xorg/individual/font/font-adobe-100dpi-1.0.2.tar.bz2
mirror://xorg/individual/font/font-adobe-75dpi-1.0.2.tar.bz2
mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.3.tar.bz2
mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.3.tar.bz2
mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-alias-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-arabic-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bh-100dpi-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bh-75dpi-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bh-ttf-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bh-type1-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bitstream-100dpi-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bitstream-75dpi-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-bitstream-type1-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-cronyx-cyrillic-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-cursor-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-daewoo-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-dec-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-ibm-type1-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-isas-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-jis-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-micro-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-misc-cyrillic-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-misc-ethiopic-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-misc-meltho-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-misc-misc-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-mutt-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-schumacher-misc-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-screen-cyrillic-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-sony-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/fontsproto-2.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-sun-misc-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-util-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-winitzki-cyrillic-1.0.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/font-xfree86-type1-1.0.2.tar.bz2
mirror://xorg/individual/proto/glproto-1.4.11.tar.bz2
mirror://xorg/X11R7.5/src/everything/iceauth-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/inputproto-2.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/kbproto-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/libAppleWM-1.4.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/libdmx-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/libfontenc-1.0.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/libFS-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/libICE-1.0.6.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.12.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/libSM-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.6.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXaw-1.0.7.tar.bz2
mirror://xorg/individual/lib/libXcomposite-0.4.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXcursor-1.1.10.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXdmcp-1.0.3.tar.bz2
mirror://xorg/individual/lib/libXext-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXfixes-4.0.5.tar.bz2
mirror://xorg/individual/lib/libXfont-1.4.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXft-2.1.14.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXi-1.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXinerama-1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/libxkbfile-1.0.6.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXmu-1.0.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXpm-3.5.8.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXrandr-1.3.0.tar.bz2
mirror://xorg/individual/lib/libXrender-0.9.6.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXres-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXScrnSaver-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXt-1.0.8.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXtst-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXv-1.0.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXvMC-1.0.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXxf86dga-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/libXxf86vm-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/luit-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/makedepend-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/mkfontdir-1.0.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/mkfontscale-1.0.7.tar.bz2
mirror://xorg/X11R7.5/src/everything/randrproto-1.3.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/recordproto-1.14.tar.bz2
mirror://xorg/X11R7.5/src/everything/renderproto-0.11.tar.bz2
mirror://xorg/X11R7.5/src/everything/resourceproto-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/scrnsaverproto-1.2.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/sessreg-1.0.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/setxkbmap-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/smproxy-1.0.3.tar.bz2
mirror://xorg/individual/util/util-macros-1.10.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/videoproto-2.3.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/windowswmproto-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/x11perf-1.5.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xauth-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xbacklight-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xbitmaps-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xcmiscproto-1.2.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xcmsdb-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xcursorgen-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xcursor-themes-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xdpyinfo-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xdriinfo-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xev-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xextproto-7.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86bigfontproto-1.2.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-acecad-1.4.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.5.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-12.6.10.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-vmmouse-12.6.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-input-void-1.3.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-apm-1.2.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-ark-0.7.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-ast-0.89.9.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-ati-6.12.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-chips-1.2.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-cirrus-1.3.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-dummy-0.3.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-fbdev-0.4.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-geode-2.11.6.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-glide-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-glint-1.2.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-i128-1.3.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-i740-1.3.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.13.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-mach64-6.8.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-mga-1.4.11.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-neomagic-1.2.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-newport-0.2.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-nv-2.1.15.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-openchrome-0.2.904.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-r128-6.8.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-rendition-4.2.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-s3-0.6.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-s3virge-1.10.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-savage-2.3.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-siliconmotion-1.7.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-sis-0.10.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-sisusb-0.9.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-suncg14-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-suncg3-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-suncg6-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-sunffb-1.2.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-sunleo-1.2.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-suntcx-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-tdfx-1.4.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-tga-1.2.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-trident-1.3.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-tseng-1.2.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-11.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-voodoo-1.2.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-wsfb-0.3.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-xgi-1.5.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86-video-xgixp-1.7.99.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xf86vidmodeproto-2.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xgamma-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xhost-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xineramaproto-1.2.tar.bz2
mirror://xorg/individual/app/xinput-1.5.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xkbcomp-1.1.1.tar.bz2
mirror://xorg/X11R7.5/src/everything/xkbevd-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xkbutils-1.0.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xkill-1.0.2.tar.bz2
mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2
mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2
mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2
mirror://xorg/individual/proto/xproto-7.0.17.tar.bz2
mirror://xorg/individual/app/xrandr-1.3.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xrdb-1.0.6.tar.bz2
mirror://xorg/X11R7.5/src/everything/xrefresh-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xset-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xsetroot-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xtrans-1.2.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/xvinfo-1.1.0.tar.bz2
mirror://xorg/X11R7.5/src/everything/xwd-1.0.3.tar.bz2
mirror://xorg/X11R7.5/src/everything/xwininfo-1.0.5.tar.bz2
mirror://xorg/X11R7.5/src/everything/xwud-1.0.2.tar.bz2

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

@ -0,0 +1,199 @@
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/dmxproto-2.3.1.tar.bz2
mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.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/X11R7.6/src/everything/xf86-input-synaptics-1.3.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.0.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.14.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/X11R7.6/src/everything/xlsclients-1.1.1.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.4.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

17
pkgs/tools/graphics/graphviz/default.nix
View File

@ -1,18 +1,19 @@
{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd , yacc, libtool, fontconfig, pango, gd, xlibs
}: }:
assert libpng != null && libjpeg != null && expat != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "graphviz-2.22.2"; name = "graphviz-2.26.3";
src = fetchurl { src = fetchurl {
url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
sha256 = "1yzda1al32la3wyrxwc1hs83sx9p84zh6xlpcpkx90xvjaav827v"; sha256 = "18bzyg17ni0lpcd2g5dhan8fjv3vzkjym38jq8vm42did5p9j47l";
}; };
buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; buildInputs =
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
pango gd
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
configureFlags = configureFlags =
[ "--with-pngincludedir=${libpng}/include" [ "--with-pngincludedir=${libpng}/include"
@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
"--with-expatincludedir=${expat}/include" "--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib" "--with-expatlibdir=${expat}/lib"
] ]
++ stdenv.lib.optional (x11 == null) "--without-x"; ++ stdenv.lib.optional (xlibs == null) "--without-x";
meta = { meta = {
description = "A program for visualising graphs"; description = "A program for visualising graphs";

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib}: { stdenv, fetchurl, pkgconfig, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nbd-2.9.20"; name = "nbd-2.9.20";
@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [pkgconfig glib]; buildInputs = [pkgconfig glib];
postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
# Glib calls `clock_gettime', which is in librt. Since we're using
# a static Glib, we need to pass it explicitly.
NIX_LDFLAGS = "-lrt";
meta = { meta = {
homepage = "http://nbd.sourceforge.net"; homepage = "http://nbd.sourceforge.net";
description = "map arbitrary files as block devices over the network"; description = "map arbitrary files as block devices over the network";

7
pkgs/tools/system/gdmap/default.nix
View File

@ -1,16 +1,19 @@
{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }: { stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gdmap-0.8.1"; name = "gdmap-0.8.1";
src = fetchurl { src = fetchurl {
url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz; url = "mirror://sourceforge/gdmap/${name}.tar.gz";
sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
}; };
buildInputs = [ gtk pkgconfig libxml2 intltool gettext ]; buildInputs = [ gtk pkgconfig libxml2 intltool gettext ];
patches = [ ./get_sensitive.patch ./set_flags.patch ];
meta = { meta = {
homepage = http://gdmap.sourceforge.net;
description = "Recursive rectangle map of disk usage"; description = "Recursive rectangle map of disk usage";
}; };
} }

34
pkgs/tools/system/gdmap/get_sensitive.patch Normal file
View File

@ -0,0 +1,34 @@
From 166de50914191303b232ec123cfbaadad521560c Mon Sep 17 00:00:00 2001
From: Alexander Myltsev <avm@altlinux.ru>
Date: Wed, 21 Apr 2010 22:43:14 +0400
Subject: [PATCH] GTK_WIDGET_SENSITIVE -> gtk_widget_get_sensitive
---
gdmap/src/gui_support.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gui_support.c b/src/gui_support.c
index 3027e29..45272d3 100644
--- a/src/gui_support.c
+++ b/src/gui_support.c
@@ -85,7 +85,7 @@ on_ebox_enter(GtkWidget* box, GdkEventCrossing* event, GtkLabel* label) {
const char* text;
(void)event;
- if (GTK_WIDGET_SENSITIVE(label)) {
+ if (gtk_widget_get_sensitive(GTK_WIDGET(label))) {
char* temp;
text = g_object_get_data(G_OBJECT(label), "label");
@@ -129,7 +129,7 @@ static void on_clear_label(GtkWidget* widget) {
void ui_event_label_set_sensitive(GtkWidget* ebox, gboolean set) {
gpointer callback = g_object_get_data(G_OBJECT(ebox), "callback");
GtkWidget* child = GTK_BIN(ebox)->child;
- if (GTK_WIDGET_SENSITIVE(child) == set) return;
+ if (gtk_widget_get_sensitive(child) == set) return;
if (set && !callback) return;
gtk_widget_set_sensitive(child, set);
--
1.7.3.3

25
pkgs/tools/system/gdmap/set_flags.patch Normal file
View File

@ -0,0 +1,25 @@
From 9a5537d2b0aba18438dd77a45354ac2e73eae23d Mon Sep 17 00:00:00 2001
From: Alexander Myltsev <avm@altlinux.ru>
Date: Mon, 13 Dec 2010 23:24:30 +0300
Subject: [PATCH] GTK_WIDGET_SET_FLAGS -> gtk_widget_set_can_focus
---
gdmap/src/gui_support.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/gui_support.c b/src/gui_support.c
index 45272d3..ca02d72 100644
--- a/src/gui_support.c
+++ b/src/gui_support.c
@@ -164,7 +164,7 @@ GtkWidget* ui_create_event_label(const char* text, GCallback callback,
// GDK_FOCUS_CHANGE_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK);
- GTK_WIDGET_SET_FLAGS(ebox, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus(ebox, TRUE);
gtk_widget_show(ebox);
--
1.7.3.3

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

@ -394,15 +394,8 @@ let
autojump = callPackage ../tools/misc/autojump { }; autojump = callPackage ../tools/misc/autojump { };
avahi = avahi = callPackage ../development/libraries/avahi {
let qt4Support = getConfig [ "avahi" "qt4Support" ] false; qt4Support = getConfig [ "avahi" "qt4Support" ] false;
in
makeOverridable (import ../development/libraries/avahi) {
inherit stdenv fetchurl pkgconfig libdaemon dbus perl perlXMLParser
expat gettext intltool lib;
inherit (gtkLibs) glib gtk;
inherit qt4Support;
qt4 = if qt4Support then qt4 else null;
}; };
axel = callPackage ../tools/networking/axel { }; axel = callPackage ../tools/networking/axel { };
@ -661,7 +654,7 @@ let
gawk = callPackage ../tools/text/gawk { }; gawk = callPackage ../tools/text/gawk { };
gdmap = callPackage ../tools/system/gdmap { gdmap = callPackage ../tools/system/gdmap {
inherit (gtkLibs216) gtk; inherit (pkgs.gtkLibs) gtk;
}; };
genext2fs = callPackage ../tools/filesystems/genext2fs { }; genext2fs = callPackage ../tools/filesystems/genext2fs { };
@ -2783,9 +2776,6 @@ let
buddy = callPackage ../development/libraries/buddy { }; buddy = callPackage ../development/libraries/buddy { };
cairo = callPackage ../development/libraries/cairo { }; cairo = callPackage ../development/libraries/cairo { };
cairo_1_10_0 = callPackage ../development/libraries/cairo/1.10.nix {
pixman = xlibs.pixman_0_20_0;
};
cairomm = callPackage ../development/libraries/cairomm { }; cairomm = callPackage ../development/libraries/cairomm { };
@ -2869,7 +2859,7 @@ let
db45 = callPackage ../development/libraries/db4/db4-4.5.nix { }; db45 = callPackage ../development/libraries/db4/db4-4.5.nix { };
dbus = callPackage ../development/libraries/dbus { dbus = callPackage ../development/libraries/dbus {
useX11 = true; # !!! `false' doesn't build useX11 = true;
}; };
dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) { dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
@ -2986,10 +2976,6 @@ let
gdbm = callPackage ../development/libraries/gdbm { }; gdbm = callPackage ../development/libraries/gdbm { };
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf {
inherit (gtkLibs1x) gtk;
};
gegl = callPackage ../development/libraries/gegl { gegl = callPackage ../development/libraries/gegl {
# avocodec avformat librsvg # avocodec avformat librsvg
inherit (gtkLibs) pango glib gtk; inherit (gtkLibs) pango glib gtk;
@ -3180,13 +3166,13 @@ let
gtkmathview = callPackage ../development/libraries/gtkmathview { }; gtkmathview = callPackage ../development/libraries/gtkmathview { };
gtkLibs = gtkLibs220; gtkLibs = gtkLibs224;
glib = gtkLibs.glib; glib = gtkLibs.glib;
gtk = gtkLibs.gtk; gtk = gtkLibs.gtk;
pango = gtkLibs.pango; pango = gtkLibs.pango;
gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in rec { gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in {
glib = callPackage ../development/libraries/glib/1.2.x.nix { }; glib = callPackage ../development/libraries/glib/1.2.x.nix { };
@ -3194,7 +3180,7 @@ let
}); });
gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in rec { gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in {
glib = callPackage ../development/libraries/glib/2.20.x.nix { }; glib = callPackage ../development/libraries/glib/2.20.x.nix { };
@ -3212,25 +3198,7 @@ let
}); });
gtkLibs218 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs218; in rec { gtkLibs220 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs220; in {
glib = callPackage ../development/libraries/glib/2.22.x.nix { };
glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { };
atk = callPackage ../development/libraries/atk/1.28.x.nix { };
pango = callPackage ../development/libraries/pango/1.26.x.nix { };
pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { };
gtk = callPackage ../development/libraries/gtk+/2.18.x.nix { };
gtkmm = callPackage ../development/libraries/gtkmm/2.18.x.nix { };
});
gtkLibs220 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs220; in rec {
glib = callPackage ../development/libraries/glib/2.24.x.nix { }; glib = callPackage ../development/libraries/glib/2.24.x.nix { };
@ -3248,7 +3216,25 @@ let
}); });
glib_2_28 = callPackage ../development/libraries/glib/2.28.x.nix {}; gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
glib = callPackage ../development/libraries/glib/2.28.x.nix { };
glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { };
atk = callPackage ../development/libraries/atk/1.32.x.nix { };
pango = callPackage ../development/libraries/pango/1.28.x.nix { };
pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { };
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.22.x.nix { };
gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { };
gtkmm = callPackage ../development/libraries/gtkmm/2.18.x.nix { };
});
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
inherit (gnome) gtk; inherit (gnome) gtk;
@ -3779,10 +3765,6 @@ let
mesa = callPackage ../development/libraries/mesa { mesa = callPackage ../development/libraries/mesa {
lipo = if stdenv.isDarwin then darwinLipoUtility else null; lipo = if stdenv.isDarwin then darwinLipoUtility else null;
}; };
mesa_7_9 = callPackage ../development/libraries/mesa/7.9.nix {
lipo = if stdenv.isDarwin then darwinLipoUtility else null;
};
metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
@ -5158,9 +5140,7 @@ let
libraw1394 = callPackage ../development/libraries/libraw1394 { }; libraw1394 = callPackage ../development/libraries/libraw1394 { };
libsexy = callPackage ../development/libraries/libsexy { libsexy = callPackage ../development/libraries/libsexy { };
inherit (gtkLibs) glib gtk pango;
};
librsvg = gnome.librsvg; librsvg = gnome.librsvg;
@ -5828,8 +5808,8 @@ let
Xaw3d = null; Xaw3d = null;
gtk = if stdenv.isDarwin then null else gtkLibs.gtk; gtk = if stdenv.isDarwin then null else gtkLibs.gtk;
# TODO: these packages don't build on Darwin. # TODO: these packages don't build on Darwin.
gconf = if stdenv.isDarwin then null else gnome.GConf; gconf = null /* if stdenv.isDarwin then null else gnome.GConf */;
librsvg = if stdenv.isDarwin then null else librsvg; librsvg = null /* if stdenv.isDarwin then null else librsvg */;
}; };
emacsSnapshot = lowPrio (callPackage ../applications/editors/emacs-snapshot { emacsSnapshot = lowPrio (callPackage ../applications/editors/emacs-snapshot {
@ -5915,9 +5895,7 @@ let
libgnomeui libglade glib gtk scrollkeeper gnome_keyring; libgnomeui libglade glib gtk scrollkeeper gnome_keyring;
}); });
evolution_data_server = (newScope (gnome // gtkLibs)) evolution_data_server = newScope (gnome // gtkLibs) ../servers/evolution-data-server { };
../servers/evolution-data-server {
};
exrdisplay = callPackage ../applications/graphics/exrdisplay { exrdisplay = callPackage ../applications/graphics/exrdisplay {
fltk = fltk20; fltk = fltk20;
@ -5978,9 +5956,7 @@ let
inherit (gnome) libIDL; inherit (gnome) libIDL;
}; };
firefox40Pkgs = let p = (applyGlobalOverrides (x : {cairo = x.cairo_1_10_0;})); firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix {
in p.callPackage
../applications/networking/browsers/firefox/4.0.nix {
inherit (p.gtkLibs) gtk pango; inherit (p.gtkLibs) gtk pango;
inherit (p.gnome) libIDL; inherit (p.gnome) libIDL;
}; };