alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs

Browse source 
The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-03-08 18:19:02 -05:00
parent 5e434ef318 8cdfd46d96
commit fc3994074e
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/servers/x11/xorg/default.nix
View file

@ -1724,9 +1724,8 @@ let
url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2; url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2;
sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"; sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8";
}; };
CFLAGS = "-I${pixman}/include/pixman-1"; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto pixman ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto pixman ;};
xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
name = "xf86-video-voodoo-1.2.4"; name = "xf86-video-voodoo-1.2.4";

5
pkgs/servers/x11/xorg/overrides.nix
View file

@ -192,6 +192,11 @@ in
buildInputs = attrs.buildInputs ++ [xorg.pixman]; buildInputs = attrs.buildInputs ++ [xorg.pixman];
}; };
xf86videovmware = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa];
};
xdriinfo = attrs: attrs // { xdriinfo = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
}; };