* Some renaming.

svn path=/nixpkgs/trunk/; revision=914
This commit is contained in:
Eelco Dolstra
2004-04-05 13:42:41 +00:00
parent 0233bc614d
commit a1ddfbc3a5
31 changed files with 4 additions and 4 deletions

View File

@@ -0,0 +1,73 @@
{stdenv, fetchurl, pkgconfig, freetype, expat}:
rec {
xproto = (import ./xproto) {
inherit fetchurl stdenv;
};
xextensions = (import ./xextensions) {
inherit fetchurl stdenv;
};
libXtrans = (import ./libXtrans) {
inherit fetchurl stdenv;
};
libXau = (import ./libXau) {
inherit fetchurl stdenv pkgconfig xproto;
};
libX11 = (import ./libX11) {
inherit fetchurl stdenv pkgconfig xproto xextensions libXtrans libXau;
};
libXext = (import ./libXext) {
inherit fetchurl stdenv pkgconfig xproto xextensions libX11;
};
libICE = (import ./libICE) {
inherit fetchurl stdenv pkgconfig libX11;
};
libSM = (import ./libSM) {
inherit fetchurl stdenv pkgconfig libX11 libICE;
};
libXt = (import ./libXt) {
inherit fetchurl stdenv pkgconfig libX11 libSM;
};
renderext = (import ./renderext) {
inherit fetchurl stdenv;
};
libXrender = (import ./libXrender) {
inherit fetchurl stdenv pkgconfig libX11 renderext;
};
fontconfig = (import ./fontconfig) {
inherit fetchurl stdenv freetype expat;
};
libXft = (import ./libXft) {
inherit fetchurl stdenv pkgconfig libX11 libXrender freetype fontconfig;
};
libXmu = (import ./libXmu) {
inherit fetchurl stdenv pkgconfig xproto libX11 libXt;
};
libXpm = (import ./libXpm) {
inherit fetchurl stdenv pkgconfig xproto libX11;
};
libXaw = (import ./libXaw) {
inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXmu libXpm;
};
xlibs = (import ./xlibs) {
inherit stdenv libX11 libXt freetype fontconfig libXft libXext;
};
}

View File

@@ -0,0 +1,5 @@
. $stdenv/setup
configureFlags="--with-confdir=$out/etc/fonts"
genericBuild

View File

@@ -0,0 +1,14 @@
{stdenv, fetchurl, freetype, expat}:
assert freetype != null && expat != null;
stdenv.mkDerivation {
name = "fontconfig-2.2.2";
builder = ./builder.sh;
src = fetchurl {
url = http://freedesktop.org/~fontconfig/release/fontconfig-2.2.2.tar.gz;
md5 = "af6e9a8addfa89aa68d703d5eb004185";
};
buildInputs = [freetype];
propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks
}

View File

@@ -0,0 +1,10 @@
{stdenv, fetchurl, pkgconfig, libX11}:
stdenv.mkDerivation {
name = "libICE-6.3.2";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libICE-6.3.2.tar.bz2;
md5 = "06db02e3df846b127a6e2dc3e345039c";
};
buildInputs = [pkgconfig libX11];
}

View File

@@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, libX11, libICE}:
stdenv.mkDerivation {
name = "libSM-6.0.2";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2;
md5 = "0ecc3ec75391d9158f25a94a652bd387";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libICE];
}

View File

@@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, xproto, xextensions, libXtrans, libXau}:
stdenv.mkDerivation {
name = "libX11-6.2.1";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libX11-6.2.1.tar.bz2;
md5 = "59b6fa7cd6fe7ee1da92fd1b56d1cee3";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto xextensions libXtrans libXau];
}

View File

@@ -0,0 +1,10 @@
{stdenv, fetchurl, pkgconfig, xproto}:
stdenv.mkDerivation {
name = "libXau-0.1.1";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXau-0.1.1.tar.bz2;
md5 = "3d747ada4a7d17538fa21c62d5608656";
};
buildInputs = [pkgconfig xproto];
}

View File

@@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXmu, libXpm}:
stdenv.mkDerivation {
name = "libXaw-7.0.0";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXaw-7.0.0.tar.bz2;
md5 = "a58fbb1b5af9e0cf23351b5b1e7b19dd";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto libX11 libXt libXmu libXpm];
}

View File

@@ -0,0 +1,10 @@
{stdenv, fetchurl, pkgconfig, xproto, xextensions, libX11}:
stdenv.mkDerivation {
name = "libXext-6.4.2";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXext-6.4.2.tar.bz2;
md5 = "e7c5f5ac3db6d171f8938339f7617281";
};
buildInputs = [pkgconfig xproto xextensions libX11];
}

View File

@@ -0,0 +1,14 @@
{stdenv, fetchurl, pkgconfig, libX11, libXrender, freetype, fontconfig}:
# !!! assert freetype `elem` fontconfig.buildInputs or some such
# assert freetype == fontconfig.freetype;
stdenv.mkDerivation {
name = "libXft-2.1.6";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/libXft-2.1.6.tar.bz2;
md5 = "ba10c9c3f4758f304f04f8d48e2f81a4";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libXrender freetype fontconfig];
}

View File

@@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt}:
stdenv.mkDerivation {
name = "libXmu-6.2.1";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXmu-6.2.1.tar.bz2;
md5 = "9bbdfe7eac185872cd1718d3f2014cf1";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto libX11 libXt];
}

View File

@@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, xproto, libX11}:
stdenv.mkDerivation {
name = "libXpm-3.5.0";
src = fetchurl {
url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXpm-3.5.0-cvs.tar.bz2;
md5 = "4695fdbc251e0b6dd1b984c51b85c781";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [xproto libX11];
}

View File

@@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, libX11, renderext}:
stdenv.mkDerivation {
name = "libXrender-0.8.4";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXrender-0.8.4.tar.bz2;
md5 = "c745339dbe5f05cff8950b71a739e34c";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 renderext];
}

View File

@@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, libX11, libSM}:
stdenv.mkDerivation {
name = "libXt-0.1.4-cvs";
src = fetchurl {
url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXt-0.1.4-cvs.tar.bz2;
md5 = "65fd5ad321e846417845e80f44131ea5";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libSM];
}

View File

@@ -0,0 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libXtrans-0.1";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXtrans-0.1.tar.bz2;
md5 = "a5ae4c7a75f930053b8327f7bd0c1361";
};
}

View File

@@ -0,0 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "renderext-0.8";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/renderext-0.8.tar.bz2;
md5 = "b00a97b00bf93ab2ac6442ea13ea9c0b";
};
}

View File

@@ -0,0 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "xextensions-1.0.1";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xextensions-1.0.1.tar.bz2;
md5 = "e61bca2a4757b736c9557dc8a7df2217";
};
}

View File

@@ -0,0 +1,8 @@
. $stdenv/setup
dontMake=1
dontMakeInstall=1
nop() {
sourceRoot=.
}
unpackPhase=nop
genericBuild

View File

@@ -0,0 +1,10 @@
{stdenv, libX11, libXt, freetype, fontconfig, libXft, libXext}:
stdenv.mkDerivation {
name = "xlib-1.0";
builder = ./builder.sh;
propagatedBuildInputs = [libX11 libXt freetype fontconfig libXft libXext];
} // {
# For compatability with XFree86.
buildClientLibs = true;
}

View File

@@ -0,0 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "xproto-6.6.1";
src = fetchurl {
url = http://freedesktop.org/~xlibs/release/xlibs-1.0/xproto-6.6.1.tar.bz2;
md5 = "8a7546a607dcd61b2ee595c763fd7f85";
};
}