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

xorg-video-unichrome: Update git url, fix build with new xorg

Browse Source
This commit is contained in:
Shea Levy 2012-07-15 22:40:52 -04:00
parent 7d64f1a93e
commit a55bcacbe2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/servers/x11/xorg/unichrome/default.nix
View File

@ -1,24 +1,25 @@
{stdenv, fetchgit, pkgconfig, fontsproto, libdrm, libpciaccess, randrproto, renderproto, {stdenv, fetchgit, pkgconfig, fontsproto, libdrm, libpciaccess, randrproto, renderproto,
videoproto, libX11, videoproto, libX11,
xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake, xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake,
autoconf, libtool, libXext, utilmacros}: autoconf, libtool, libXext, utilmacros, pixman}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xf86-video-unichrome-git"; name = "xf86-video-unichrome-git";
src = fetchgit { src = fetchgit {
url = "git://anongit.freedesktop.org/~libv/xf86-video-unichrome"; url = "git://people.freedesktop.org/~libv/xf86-video-unichrome";
md5 = "6e5e0f8ee204af2385a02e502d1ca8f1"; md5 = "6e5e0f8ee204af2385a02e502d1ca8f1";
rev = "6260e0fc9f0754d101dda014a8f4b5f76f58e978"; rev = "6260e0fc9f0754d101dda014a8f4b5f76f58e978";
}; };
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto
videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC
glproto mesa automake autoconf libtool libXext utilmacros ]; glproto mesa automake autoconf libtool libXext utilmacros pixman ];
preConfigure = "chmod +x autogen.sh"; preConfigure = "chmod +x autogen.sh";
prePatch = '' prePatch = ''
sed s,/bin/bash,/bin/sh, -i git_version.sh sed s,/bin/bash,/bin/sh, -i git_version.sh
''; '';
patches = [ ./configure.patch ]; patches = [ ./configure.patch ];
configureScript = "./autogen.sh"; configureScript = "./autogen.sh";
CFLAGS="-I${pixman}/include/pixman-1";
meta = { meta = {
homepage = "http://unichrome.sourceforge.net/"; homepage = "http://unichrome.sourceforge.net/";