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

* Latest Cairo / GTK.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11692
This commit is contained in:
Eelco Dolstra 2008-04-23 10:48:10 +00:00
parent 6aae26a1d8
commit 319feed942
5 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,27 +2,22 @@
, pdfSupport ? true , pdfSupport ? true
, pngSupport ? true , pngSupport ? true
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
, zlib, libpng , zlib, libpng, pixman
}: }:
assert postscriptSupport -> zlib != null; assert postscriptSupport -> zlib != null;
assert pngSupport -> libpng != null; assert pngSupport -> libpng != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cairo-1.4.14"; name = "cairo-1.6.4";
src = fetchurl { src = fetchurl {
url = http://cairographics.org/releases/cairo-1.4.14.tar.gz; url = http://cairographics.org/releases/cairo-1.6.4.tar.gz;
sha256 = "15l87pzmlwbxk6m4102g2zln4drq0l32qs60ccs5bpmcnky2lqya"; sha1 = "9d990fe39a125ceb07221623c237cd7015855d5c";
}; };
patches = [
# http://bugs.freedesktop.org/show_bug.cgi?id=10989
./isspace.patch
];
buildInputs = [ buildInputs = [
pkgconfig x11 fontconfig freetype pkgconfig x11 fontconfig freetype pixman
]; ];
propagatedBuildInputs = propagatedBuildInputs =

6
pkgs/development/libraries/gtk-libs/2.12/gtk+/default.nix
View File

@ -1,11 +1,11 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gtk+-2.12.8"; name = "gtk+-2.12.9";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gtk+/2.12/gtk+-2.12.8.tar.bz2; url = mirror://gnome/sources/gtk+/2.12/gtk+-2.12.9.tar.bz2;
sha256 = "1vzh73lxpp4m85zxhwjkigc28qnfxfjppxmywvwqj86ablnm8bzz"; md5 = "33499772fdc3bea569c6d5673e5831b4";
}; };
buildInputs = [pkgconfig perl]; buildInputs = [pkgconfig perl];

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

@ -1155,14 +1155,14 @@ rec {
}) // {inherit libX11 libXext libXmu libXt ;}; }) // {inherit libX11 libXext libXmu libXt ;};
pixman = (stdenv.mkDerivation { pixman = (stdenv.mkDerivation {
name = "pixman-0.9.6"; name = "pixman-0.10.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/lib/pixman-0.9.6.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/lib/pixman-0.10.0.tar.bz2;
sha256 = "0nrksqwkaq1kczzkpqw1nvxc0b2d89d81gzb4j43hz6n729xn165"; sha256 = "1r6il420j7ws9xbk6y3nn8zb7mc76rk1npz5763qp525n94iz11b";
}; };
buildInputs = [pkgconfig libX11 ]; buildInputs = [pkgconfig ];
}) // {inherit libX11 ;}; }) // {inherit ;};
printproto = (stdenv.mkDerivation { printproto = (stdenv.mkDerivation {
name = "printproto-1.0.3"; name = "printproto-1.0.3";
@ -1741,11 +1741,11 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-evdev-1.1.2.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-input-evdev-1.1.2.tar.bz2;
sha256 = "15avwy8isbqagzcdj20ngqajl22k40pssfx7vjirhrqyyq19fiwb"; sha256 = "15avwy8isbqagzcdj20ngqajl22k40pssfx7vjirhrqyyq19fiwb";
}; };
buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
preBuild = " preBuild = "
sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c
"; ";
buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ]; }) // {inherit inputproto kbproto xorgserver xproto ;};
}) // {inherit inputproto kbproto randrproto xorgserver xproto ;};
xf86inputfpit = (stdenv.mkDerivation { xf86inputfpit = (stdenv.mkDerivation {
name = "xf86-input-fpit-1.1.0"; name = "xf86-input-fpit-1.1.0";
@ -1984,8 +1984,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ati-6.6.3.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-ati-6.6.3.tar.bz2;
sha256 = "102p6nz1jvd3pgbl83a4zi99smydqr6il61r33l0lqmi3yg452nh"; sha256 = "102p6nz1jvd3pgbl83a4zi99smydqr6il61r33l0lqmi3yg452nh";
}; };
buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto ]; buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
}) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto mesaHeaders glproto;}; }) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
xf86videochips = (stdenv.mkDerivation { xf86videochips = (stdenv.mkDerivation {
name = "xf86-video-chips-1.1.1"; name = "xf86-video-chips-1.1.1";
@ -2214,8 +2214,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sis-0.9.3.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sis-0.9.3.tar.bz2;
sha256 = "1xin2hcjjwj2810h7kxhkmqq841plbsvk0swmjl9py7z2vxyi3l9"; sha256 = "1xin2hcjjwj2810h7kxhkmqq841plbsvk0swmjl9py7z2vxyi3l9";
}; };
buildInputs = [pkgconfig fontsproto glproto mesaHeaders libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
}) // {inherit fontsproto glproto mesaHeaders libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
xf86videosisusb = (stdenv.mkDerivation { xf86videosisusb = (stdenv.mkDerivation {
name = "xf86-video-sisusb-0.8.1"; name = "xf86-video-sisusb-0.8.1";
@ -2224,8 +2224,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sisusb-0.8.1.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sisusb-0.8.1.tar.bz2;
sha256 = "1js5vf5xjxpi0nb0bpjc1glbx2l0fq1wqmnlwayn6cp3nfdbg5hm"; sha256 = "1js5vf5xjxpi0nb0bpjc1glbx2l0fq1wqmnlwayn6cp3nfdbg5hm";
}; };
buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ]; buildInputs = [pkgconfig fontsproto glproto mesaHeaders randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ];
}) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ;}; }) // {inherit fontsproto glproto mesaHeaders randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ;};
xf86videosunbw2 = (stdenv.mkDerivation { xf86videosunbw2 = (stdenv.mkDerivation {
name = "xf86-video-sunbw2-1.1.0"; name = "xf86-video-sunbw2-1.1.0";
@ -2714,8 +2714,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-server-1.4.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xorg-server-1.4.tar.bz2;
sha256 = "1hpbq0bl1jkq84gvksp0xzbbrwwgl0wz2wakf11p2hld6bgl5cai"; sha256 = "1hpbq0bl1jkq84gvksp0xzbbrwwgl0wz2wakf11p2hld6bgl5cai";
}; };
buildInputs = [pkgconfig pixman renderproto bigreqsproto compositeproto damageproto dbus.libs libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ]; buildInputs = [pkgconfig pixman renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ]; mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ];
}) // {inherit pixman renderproto bigreqsproto compositeproto damageproto libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;}; }) // {inherit pixman renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto evieext fixesproto fontcacheproto libfontenc fontsproto freetype glproto hal inputproto kbproto libdrm mkfontdir mkfontscale perl printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libxkbui libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXxf86misc libXxf86vm zlib ;};
xorgsgmldoctools = (stdenv.mkDerivation { xorgsgmldoctools = (stdenv.mkDerivation {
name = "xorg-sgml-doctools-1.2"; name = "xorg-sgml-doctools-1.2";

2
pkgs/servers/x11/xorg/tarballs
View File

@ -292,5 +292,5 @@ http://xcb.freedesktop.org/dist/libxcb-1.1.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.1.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.2.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.2.tar.bz2
http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2 http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2
http://mirror.switch.ch/ftp/mirror/X11/pub/individual/lib/pixman-0.9.6.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/individual/lib/pixman-0.10.0.tar.bz2
http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2 http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2

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

@ -2191,6 +2191,7 @@ rec {
cairo = import ../development/libraries/cairo { cairo = import ../development/libraries/cairo {
inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng; inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
inherit (xlibs) pixman;
}; };
cairomm = import ../development/libraries/cairomm { cairomm = import ../development/libraries/cairomm {