2009-04-28 15:58:35 +02:00
|
|
|
{args, xorg}:
|
2009-11-21 15:49:25 +01:00
|
|
|
let
|
|
|
|
setMalloc0ReturnsNullCrossCompiling = ''
|
|
|
|
if test -n "$crossConfig"; then
|
|
|
|
configureFlags="$configureFlags --enable-malloc0returnsnull";
|
|
|
|
fi
|
|
|
|
'';
|
|
|
|
in
|
2009-04-28 15:58:35 +02:00
|
|
|
{
|
|
|
|
|
|
|
|
fontmiscmisc = attrs: attrs // {
|
|
|
|
postInstall =
|
|
|
|
''
|
2009-11-06 16:16:47 +01:00
|
|
|
ALIASFILE=${xorg.fontalias}/share/fonts/X11/misc/fonts.alias
|
|
|
|
test -f $ALIASFILE
|
|
|
|
ln -s $ALIASFILE $out/lib/X11/fonts/misc/fonts.alias
|
2009-10-02 20:03:23 +02:00
|
|
|
'';
|
2009-04-28 15:58:35 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
imake = attrs: attrs // {
|
|
|
|
inherit (xorg) xorgcffiles;
|
|
|
|
x11BuildHook = ./imake.sh;
|
2009-10-02 20:03:23 +02:00
|
|
|
patches = [./imake.patch];
|
2009-04-28 15:58:35 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
mkfontdir = attrs: attrs // {
|
|
|
|
preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR ${xorg.mkfontscale}/bin";
|
|
|
|
};
|
2009-11-21 11:11:44 +01:00
|
|
|
|
|
|
|
libxcb = attrs : attrs // {
|
2009-11-21 11:44:22 +01:00
|
|
|
# I only remove python from the original, and add xproto. I don't know how
|
|
|
|
# to achieve that referring to attrs.buildInputs.
|
Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
Maybe we should have a single stdenv and forget about the stdenvCross
adapter - this could end in a stdenv a bit complex, but simpler than the
generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
now works for both the cross and the native compilers, but I think this
should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
its manual, so the derivation still fails. Guile requires patching to
cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
derivation variables mixed with those of the stdenvCross.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 20:51:45 +01:00
|
|
|
# I should use: builtins.unsafeDiscardStringContext
|
2009-11-21 11:44:22 +01:00
|
|
|
buildInputs = [args.pkgconfig args.libxslt xorg.libpthreadstubs /*xorg.python*/
|
|
|
|
xorg.libXau xorg.xcbproto xorg.libXdmcp ] ++ [ xorg.xproto ];
|
|
|
|
buildNativeInputs = [ args.python ];
|
|
|
|
};
|
|
|
|
|
|
|
|
xcbproto = attrs : attrs // {
|
|
|
|
# I only remove python from the original.
|
|
|
|
buildInputs = [args.pkgconfig /*xorg.python*/ ];
|
|
|
|
buildNativeInputs = [ args.python ];
|
2009-11-21 11:11:44 +01:00
|
|
|
};
|
2009-04-28 15:58:35 +02:00
|
|
|
|
2010-01-22 19:49:16 +01:00
|
|
|
pixman = attrs : attrs // {
|
|
|
|
buildInputs = [ args.pkgconfig ];
|
|
|
|
buildNativeInputs = [ args.perl ];
|
|
|
|
};
|
|
|
|
|
2009-11-21 15:49:25 +01:00
|
|
|
libX11 = attrs: attrs // {
|
|
|
|
preConfigure = setMalloc0ReturnsNullCrossCompiling;
|
|
|
|
};
|
|
|
|
|
|
|
|
libXrender = attrs: attrs // {
|
|
|
|
preConfigure = setMalloc0ReturnsNullCrossCompiling;
|
|
|
|
};
|
|
|
|
|
|
|
|
libXxf86vm = attrs: attrs // {
|
|
|
|
preConfigure = setMalloc0ReturnsNullCrossCompiling;
|
|
|
|
};
|
|
|
|
|
|
|
|
libXrandr = attrs: attrs // {
|
|
|
|
preConfigure = setMalloc0ReturnsNullCrossCompiling;
|
|
|
|
};
|
|
|
|
|
2011-02-09 16:09:29 +01:00
|
|
|
# Propagate some build inputs because of header file dependencies.
|
2009-11-21 15:49:25 +01:00
|
|
|
libXt = attrs: attrs // {
|
|
|
|
preConfigure = setMalloc0ReturnsNullCrossCompiling;
|
2011-02-08 18:39:28 +01:00
|
|
|
propagatedBuildInputs = [ xorg.libSM ];
|
2009-11-21 15:49:25 +01:00
|
|
|
};
|
|
|
|
|
2011-02-09 16:09:29 +01:00
|
|
|
compositeproto = attrs: attrs // {
|
|
|
|
propagatedBuildInputs = [ xorg.fixesproto ];
|
|
|
|
};
|
|
|
|
|
|
|
|
libXcomposite = attrs: attrs // {
|
|
|
|
propagatedBuildInputs = [ xorg.libXfixes ];
|
|
|
|
};
|
|
|
|
|
2009-11-21 15:49:25 +01:00
|
|
|
libXft = attrs: attrs // {
|
|
|
|
buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.libX11
|
|
|
|
xorg.renderproto ];
|
|
|
|
preConfigure = setMalloc0ReturnsNullCrossCompiling;
|
|
|
|
};
|
|
|
|
|
2009-10-29 18:56:10 +01:00
|
|
|
libXext = attrs: attrs // {
|
|
|
|
buildInputs = attrs.buildInputs ++ [xorg.libXau];
|
2009-11-21 15:49:25 +01:00
|
|
|
preConfigure = setMalloc0ReturnsNullCrossCompiling;
|
2009-10-29 18:56:10 +01:00
|
|
|
};
|
|
|
|
|
2009-04-28 15:58:35 +02:00
|
|
|
libXpm = attrs: attrs // {
|
|
|
|
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
|
|
|
|
};
|
|
|
|
|
|
|
|
setxkbmap = attrs: attrs // {
|
|
|
|
postInstall =
|
|
|
|
''
|
|
|
|
ensureDir $out/share
|
|
|
|
ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11
|
|
|
|
'';
|
|
|
|
};
|
|
|
|
|
|
|
|
xf86inputevdev = attrs: attrs // {
|
|
|
|
configureFlags = "--with-sdkdir=\${out}/include/xorg";
|
|
|
|
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
|
|
|
|
buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto];
|
|
|
|
};
|
|
|
|
|
2009-11-04 20:53:23 +01:00
|
|
|
xf86inputsynaptics = attrs: attrs // {
|
|
|
|
makeFlags = "sdkdir=\${out}/include/xorg";
|
|
|
|
};
|
|
|
|
|
2009-04-28 15:58:35 +02:00
|
|
|
xf86videointel = attrs: attrs // {
|
|
|
|
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
|
|
|
};
|
|
|
|
|
|
|
|
xf86videosis = attrs: attrs // {
|
|
|
|
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
|
|
|
};
|
|
|
|
|
2009-05-05 14:38:04 +02:00
|
|
|
xf86videoati = attrs: attrs // {
|
|
|
|
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
2009-06-18 19:20:01 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
xf86videoopenchrome = attrs: attrs // {
|
2009-11-23 22:40:26 +01:00
|
|
|
name = "xf86-video-openchrome-svn-816";
|
2009-07-11 12:32:27 +02:00
|
|
|
src = args.fetchsvn {
|
|
|
|
url = http://svn.openchrome.org/svn/trunk;
|
2009-11-05 22:34:31 +01:00
|
|
|
sha256 = "1mhfh1n1x7fnxdbbkbz13lzd57m6xi3n9cblzgm43mz5bamacr02";
|
|
|
|
rev = 816;
|
2009-07-11 12:32:27 +02:00
|
|
|
};
|
|
|
|
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa args.automake args.autoconf args.libtool xorg.libXext];
|
|
|
|
preConfigure = "chmod +x autogen.sh";
|
|
|
|
configureScript = "./autogen.sh";
|
2009-05-05 14:38:04 +02:00
|
|
|
};
|
|
|
|
|
2009-11-08 12:34:17 +01:00
|
|
|
xdriinfo = attrs: attrs // {
|
|
|
|
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
|
|
|
};
|
|
|
|
|
2009-04-28 15:58:35 +02:00
|
|
|
xkbcomp = attrs: attrs // {
|
2009-05-05 14:38:04 +02:00
|
|
|
NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\"";
|
2009-04-28 15:58:35 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
xorgserver = attrs: attrs // {
|
|
|
|
patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
|
2009-10-29 18:56:10 +01:00
|
|
|
buildInputs = attrs.buildInputs ++
|
2010-07-20 21:24:21 +02:00
|
|
|
[ args.zlib args.udev args.mesa
|
|
|
|
xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto
|
2009-10-29 18:56:10 +01:00
|
|
|
xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
|
2010-07-20 21:24:21 +02:00
|
|
|
xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto
|
|
|
|
xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
|
|
|
|
xorg.recordproto xorg.libXext
|
2009-10-29 18:56:10 +01:00
|
|
|
];
|
2009-11-04 00:54:08 +01:00
|
|
|
propagatedBuildInputs =
|
|
|
|
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ];
|
2009-09-10 00:16:09 +02:00
|
|
|
postInstall =
|
|
|
|
''
|
2010-03-09 16:35:46 +01:00
|
|
|
rm -fr $out/share/X11/xkb/compiled
|
2009-09-10 00:16:09 +02:00
|
|
|
ln -s /var/tmp $out/share/X11/xkb/compiled
|
|
|
|
'';
|
2009-04-28 15:58:35 +02:00
|
|
|
};
|
2009-10-02 15:06:35 +02:00
|
|
|
|
|
|
|
libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
|
|
|
|
configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
|
|
|
|
};
|
2009-10-02 20:03:23 +02:00
|
|
|
|
2010-07-17 00:04:56 +02:00
|
|
|
lndir = attrs: attrs // {
|
|
|
|
preConfigure = ''
|
|
|
|
substituteInPlace lndir.c \
|
|
|
|
--replace 'n_dirs--;' ""
|
|
|
|
'';
|
|
|
|
};
|
|
|
|
|
2009-04-28 15:58:35 +02:00
|
|
|
}
|