mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
Fix xf86vmware fix
Moved xf86vmware fix into the overrides.nix file where and not in the generated default.nix.
This commit is contained in:
parent
089fd0a769
commit
8cdfd46d96
@ -1724,9 +1724,8 @@ let
|
||||
url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2;
|
||||
sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8";
|
||||
};
|
||||
CFLAGS = "-I${pixman}/include/pixman-1";
|
||||
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 pixman ;};
|
||||
buildInputs = [pkgconfig 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 ;};
|
||||
|
||||
xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
|
||||
name = "xf86-video-voodoo-1.2.4";
|
||||
|
@ -192,6 +192,11 @@ in
|
||||
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 // {
|
||||
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user