nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix xf86vmware fix

Browse Source 
Moved xf86vmware fix into the overrides.nix file where and not in the
generated default.nix.
This commit is contained in:
Patrick Wheeler 2013-03-02 01:08:33 +01:00
parent 089fd0a769
commit 8cdfd46d96
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];
}; };