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

* Merged the xorg-7.5 branch, which provides X.org 7.5 and various

Browse Source 
other X-related updates.

svn path=/nixpkgs/trunk/; revision=18124
This commit is contained in:
Eelco Dolstra
2009-11-04 22:42:44 +00:00
parent 2e8ae96930 4f839e9a54
commit b039fddfbc
174 changed files with 1352 additions and 4796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,31 +1,34 @@
{ postscriptSupport ? true
, pdfSupport ? true
, pngSupport ? true
, xcbSupport ? false
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
, zlib, libpng, pixman, libxcb, xcbutil
, 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.8.6";
name = "cairo-1.8.8";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz";
sha256 = "0d9mfwq7r66j85hqjcjavwbn7c8gdaqnahmmiyz5iwpc1jplg8wk";
sha256 = "140w8pz2k2kmjdaav3rfy009rjf2hqycsnk7lq0nwnf4bpgd6l9w";
};
buildInputs = [
pkgconfig x11 fontconfig pixman libxcb xcbutil
];
buildInputs =
[ pkgconfig x11 fontconfig pixman ] ++
stdenv.lib.optionals xcbSupport [ libxcb xcbutil ];
propagatedBuildInputs =
[ freetype ] ++
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
configureFlags = ["--enable-xcb"] ++
configureFlags =
stdenv.lib.optional xcbSupport "--enable-xcb" ++
stdenv.lib.optional pdfSupport "--enable-pdf";
preConfigure = ''

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

@@ -1,14 +1,14 @@
{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }:
stdenv.mkDerivation rec {
name = "cairomm-1.7.2";
name = "cairomm-1.8.4";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz";
sha256 = "0rcbkk16yj9k1y491ms5j6f9z5wrvv4qkd7wbx44nziwhw6hc0qx";
sha256 = "1wf8lvijrk5q5jhxxxfy2yjp97azwdyxfb7kfs8d14wgmzcwd3m2";
};
buildInputs = [pkgconfig];
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];

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

@@ -8,7 +8,7 @@ let
sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln";
};
configureFlags = "--localstatedir=/var --with-session-socket-dir=/tmp";
configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
in rec {
@@ -19,10 +19,13 @@ in rec {
inherit src configureFlags;
patchPhase = ''
sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
sed -i '/SUBDIRS/s/ tools//' Makefile.in
'';
patchPhase =
''
sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
sed -i '/SUBDIRS/s/ tools//' Makefile.in
'';
installFlags = "sysconfdir=$(out)/etc";
};
tools = stdenv.mkDerivation {
@@ -39,10 +42,11 @@ in rec {
makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
patchPhase = ''
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
'';
patchPhase =
''
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
'';
};
# I'm too lazy to separate daemon and libs now.

58
pkgs/development/libraries/dbus/temp.nix
View File

@@ -1,58 +0,0 @@
{stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true}:
let
version = "1.2.16";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln";
};
configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
in rec {
libs = stdenv.mkDerivation {
name = "dbus-library-" + version;
buildInputs = [pkgconfig expat];
inherit src configureFlags;
patchPhase =
''
sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
sed -i '/SUBDIRS/s/ tools//' Makefile.in
'';
installFlags = "sysconfdir=$(out)/etc";
};
tools = stdenv.mkDerivation {
name = "dbus-tools-" + version;
inherit src configureFlags;
buildInputs = [pkgconfig expat libs]
++ stdenv.lib.optionals useX11 [libX11 libICE libSM];
postConfigure = "cd tools";
NIX_LDFLAGS = "-ldbus-1";
makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
patchPhase =
''
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
'';
};
# I'm too lazy to separate daemon and libs now.
daemon = libs;
# FIXME TODO
# After merger it will be better to correct upstart-job instead.
outPath = daemon.outPath;
}

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

@@ -1,22 +1,24 @@
{stdenv, fetchurl, freetype, expat}:
stdenv.mkDerivation {
name = "fontconfig-2.6.0";
stdenv.mkDerivation rec {
name = "fontconfig-2.7.3";
src = fetchurl {
url = http://fontconfig.org/release/fontconfig-2.6.0.tar.gz;
sha256 = "19fqr2vh7rzpqfh2lnkymh7q5pxn9r4w2z35lh36crp5l3m3k9m9";
url = "http://fontconfig.org/release/${name}.tar.gz";
sha256 = "0l5hjifapv4v88a204ixg6w6xly81cji2cr65znra0vbbkqvz3xs";
};
buildInputs = [freetype];
propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks
preConfigure = ''
configureFlags="--with-confdir=$out/etc/fonts --disable-docs --with-default-fonts="
'';
configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
# Don't try to write to /etc/fonts or /var/cache/fontconfig at install time.
installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy";
meta = {
description = "A library for font customization and configuration";
homepage = http://fontconfig.org/;
license = "bsd";
};
}

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

@@ -1,17 +1,29 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl
, # FreeType supports hinting using a TrueType bytecode interpreter,
# as well as sub-pixel rendering. These are patented by Apple and
# Microsoft, respectively, so they are disabled by default. This
# option allows them to be enabled. See
# http://www.freetype.org/patents.html.
useEncumberedCode ? false
}:
stdenv.mkDerivation rec {
name = "freetype-2.3.9";
name = "freetype-2.3.11";
src = fetchurl {
url = "mirror://sourceforge/freetype/${name}.tar.bz2";
sha256 = "1dia4j01aqdcrkpfkcniswcrccdx4jx2p3hyhbh76kchx6y3782i";
sha256 = "1j9f3q7vkdhlcxmfhkkyvxmniih2gcsb428v73mfk88qc0g3n0wa";
};
configureFlags = "--disable-static";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode
"-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1 -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER=1";
meta = {
description = "A font rendering engine";
homepage = http://www.freetype.org/;
license = "GPLv2+"; # or the FreeType License (BSD + advertising clause)
};
}

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg
, libpng, cairo, perl, jasper, xlibs
, xineramaSupport ? true
, cupsSupport ? true, cups ? null, openssl ? null
, cupsSupport ? true, cups ? null
}:
assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null && openssl != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
name = "gtk+-2.18.3";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups openssl ];
++ stdenv.lib.optionals cupsSupport [ cups ];
passthru = { inherit libtiff libjpeg libpng; };

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

@@ -1,17 +1,18 @@
{stdenv, fetchurl, pkgconfig, pthread_stubs}:
{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
stdenv.mkDerivation rec {
name = "libdrm-2.4.9";
name = "libdrm-2.4.15";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "18i1c4pcy2db2alali1yxg1s72vdpikivahmbrp7wf204kn236zd";
sha256 = "1pm7iddv3yjwvqmlbdmj9m55bmkfcfzq0wvqpgx4gkmdjfd8kzxw";
};
buildInputs = [ pkgconfig pthread_stubs ];
buildInputs = [ pkgconfig libpthreadstubs ];
meta = {
homepage = http://dri.freedesktop.org/libdrm/;
description = "Library for accessing the kernel's Direct Rendering Manager";
license = "bsd";
};
}

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

@@ -4,17 +4,17 @@
stdenv.mkDerivation rec {
name = "libgsf-1.14.9";
name = "libgsf-1.14.16";
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/${name}.tar.bz2";
sha256 = "1mkw60052sd6k9sq8ppz4yra0s3sdinngqi6bcmrj9977zk8yqfi";
sha256 = "0249n2hgrcnzphinaxng0cpn7afchg84l4ka4wka9kyv3g58zz8i";
};
buildInputs = [
perl perlXMLParser pkgconfig libxml2 glib gettext bzip2
gnomevfs libbonobo python intltool
];
buildInputs =
[ perl perlXMLParser pkgconfig gettext bzip2 gnomevfs python intltool ];
propagatedBuildInputs = [ glib libxml2 libbonobo ];
doCheck = true;

25
pkgs/development/libraries/libjpeg/builder.sh
View File

@@ -1,25 +0,0 @@
source $stdenv/setup
preConfigure() {
# Workarounds for the ancient libtool shipped by libjpeg.
ln -s $libtool/bin/libtool .
cp $libtool/share/libtool/config.guess .
cp $libtool/share/libtool/config.sub .
}
preInstall() {
mkdir $out
mkdir $out/bin
mkdir $out/lib
mkdir $out/include
mkdir $out/man
mkdir $out/man/man1
}
patchPhase() {
for i in $patches; do
patch < $i
done
}
genericBuild

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

@@ -1,29 +1,18 @@
{stdenv, fetchurl, libtool, static ? false, ...}:
{ stdenv, fetchurl, libtool, static ? false }:
stdenv.mkDerivation {
name = "libjpeg-6b";
builder = ./builder.sh;
name = "libjpeg-7";
src = fetchurl {
url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
md5 = "dbd5f3b47ed13132f04c685d608a7547";
url = http://www.ijg.org/files/jpegsrc.v7.tar.gz;
sha256 = "1gvy6f83pskxrxwnxqah3g9mhnlgi6aph39b99609gn50ri8ddsh";
};
inherit libtool;
configureFlags = "--enable-shared ${if static then " --enable-static" else ""}";
# Required for building of dynamic libraries on Darwin.
patches = [
(fetchurl {
url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltconfig;
md5 = "e6725fa4a09aa1de4ca75343fd0f61d5";
})
(fetchurl {
url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltmain.sh;
#md5 = "489986ad8e7a93aef036766b25f321d5";
md5 = "092a12aeb0c386dd7dae059109d950ba";
})
];
meta = {
homepage = http://www.ijg.org/;
description = "A library that implements the JPEG image file format";
license = "free";
};
}

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

@@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
name = "libpng-1.2.35";
name = "libpng-1.2.40";
src = fetchurl {
url = mirror://sourceforge/libpng/libpng-1.2.35.tar.bz2;
md5 = "b8b8d09adf6bee2c5902c8e54c4f2e68";
url = "mirror://sourceforge/libpng/${name}.tar.gz";
md5 = "a2f6808735bf404967f81519a967fb2a";
};
propagatedBuildInputs = [zlib];
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
meta = {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
};
}

5
pkgs/development/libraries/libtiff/builder.sh
View File

@@ -1,5 +0,0 @@
source $stdenv/setup
configureFlags="--with-DIR_MAN=$out/man --with-ZIP --with-JPEG"
genericBuild

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

@@ -1,14 +1,18 @@
{stdenv, fetchurl, zlib, libjpeg}:
assert zlib != null && libjpeg != null;
{ stdenv, fetchurl, zlib, libjpeg }:
stdenv.mkDerivation {
name = "libtiff-3.8.2";
builder = ./builder.sh;
name = "libtiff-3.9.1";
src = fetchurl {
url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz;
md5 = "fbb6f446ea4ed18955e2714934e5b698";
url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.1.tar.gz;
sha256 = "168yssav47xih2y17m7psj4k6ngnfai300bbfznc75hn3crxfdil";
};
propagatedBuildInputs = [zlib libjpeg];
inherit zlib libjpeg;
meta = {
description = "Library and utilities for working with the TIFF image file format";
homepage = http://www.libtiff.org/;
license = "bsd";
};
}

27
pkgs/development/libraries/libxml2/2.7.4.nix
View File

@@ -1,27 +0,0 @@
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
assert pythonSupport -> python != null;
stdenv.mkDerivation {
name = "libxml2-2.7.4";
src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.4.tar.gz;
sha256 = "1psk9r69z02cmjpbixs89qj0zprfyi6xc598j51cc0gah0h3wq03";
};
configureFlags = ''
${if pythonSupport then "--with-python=${python}" else ""}
'';
propagatedBuildInputs = [zlib];
setupHook = ./setup-hook.sh;
passthru = {inherit pythonSupport;};
meta = {
homepage = http://xmlsoft.org/;
description = "A XML parsing library for C";
};
}

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

@@ -1,13 +1,13 @@
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true, ...}:
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
assert pythonSupport -> python != null;
stdenv.mkDerivation {
name = "libxml2-2.7.3";
name = "libxml2-2.7.6";
src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.3.tar.gz;
sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5";
url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.6.tar.gz;
sha256 = "0n61rqqfiv0m64p01cwx205i6hb0mmzf7r0ya40s4fiqd2nhkkg0";
};
configureFlags = ''
@@ -23,5 +23,6 @@ stdenv.mkDerivation {
meta = {
homepage = http://xmlsoft.org/;
description = "A XML parsing library for C";
license = "bsd";
};
}

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

@@ -1,11 +1,11 @@
{stdenv, fetchurl, libxml2, ...}:
stdenv.mkDerivation {
name = "libxslt-1.1.24";
stdenv.mkDerivation rec {
name = "libxslt-1.1.26";
src = fetchurl {
url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz;
sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e";
url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
sha256 = "1c9xdv39jvq1hp16gsbi56hbz032dmqyy0fpi4ls1y3152s55pam";
};
buildInputs = [libxml2];
@@ -18,5 +18,6 @@ stdenv.mkDerivation {
meta = {
homepage = http://xmlsoft.org/XSLT/;
description = "A C library and tools to do XSL transformations";
license = "bsd";
};
}

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

@@ -1,26 +1,27 @@
{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat}:
{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat }:
if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" && stdenv.system != "i686-darwin" && stdenv.system != "i686-freebsd" then
throw "unsupported platform for Mesa"
else
stdenv.mkDerivation {
name = "mesa-7.4.1";
name = "mesa-7.5.2";
src = fetchurl {
url = mirror://sourceforge/mesa3d/MesaLib-7.4.1.tar.bz2;
md5 = "423260578b653818ba66c2fcbde6d7ad";
url = ftp://ftp.freedesktop.org/pub/mesa/7.5.2/MesaLib-7.5.2.tar.bz2;
md5 = "94e47a499f1226803869c2e37a6a8e3a";
};
buildInputs = [
pkgconfig expat x11 libdrm xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
];
buildInputs =
[ pkgconfig expat x11 libdrm xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
];
passthru = {inherit libdrm;};
passthru = { inherit libdrm; };
meta = {
description = "An open source implementation of OpenGL";
homepage = http://www.mesa3d.org/;
license = "bsd";
};
}

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

@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig glib dbus.libs dbus_glib expat pam intltool
gettext libxslt
];
[ pkgconfig glib dbus_glib pam intltool gettext libxslt ];
propagatedBuildInputs = [ expat dbus.libs ];
configureFlags = "--localstatedir=/var --sysconfdir=/etc";

8
pkgs/development/libraries/pthread-stubs/default.nix
View File

@@ -1,8 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "pthread-stubs-0.1";
src = fetchurl {
url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2;
sha256 = "0raxl73kmviqinp00bfa025d0j4vmfjjcvfn754mi60mw48swk80";
};
}

4
pkgs/development/libraries/qt-3/default.nix
View File

@@ -2,7 +2,7 @@
, xftSupport ? true, libXft ? null
, xrenderSupport ? true, libXrender ? null
, xrandrSupport ? true, libXrandr ? null, randrproto ? null
, xineramaSupport ? true, libXinerama ? null, xineramaproto ? null
, xineramaSupport ? true, libXinerama ? null
, cursorSupport ? true, libXcursor ? null
, threadSupport ? true
, mysqlSupport ? true, mysql ? null
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
${if xrandrSupport then "-xrandr
-L${libXrandr}/lib -I${libXrandr}/include
-I${randrproto}/include" else "-no-xrandr"}
${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${xineramaproto}/include" else "-no-xinerama"}
${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"}
${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""}
${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""}
${if xftSupport then "-xft

25
pkgs/development/tools/misc/icon-naming-utils/default.nix
View File

@@ -1,20 +1,23 @@
{stdenv, fetchurl, perl, XMLSimple}:
stdenv.mkDerivation {
name = "icon-naming-utils-0.8.7";
stdenv.mkDerivation rec {
name = "icon-naming-utils-0.8.90";
src = fetchurl {
url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz;
sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w";
url = "http://tango.freedesktop.org/releases/${name}.tar.gz";
sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4";
};
buildInputs = [perl XMLSimple];
postInstall = "
# Add XML::Simple to the runtime search path.
substituteInPlace $out/libexec/icon-name-mapping \\
--replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl';
ensureDir $out/lib
ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
";
postInstall =
''
# Add XML::Simple to the runtime search path.
substituteInPlace $out/libexec/icon-name-mapping \
--replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl'
'';
meta = {
homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification;
};
}