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

vmware driver: depend on mesa_drivers to find libxatracker

This commit is contained in:
Vladimír Čunát 2013-05-22 17:07:12 +02:00
parent 1d38b4842a
commit e3ff0f116f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/x11/xorg/overrides.nix
View File

@ -150,6 +150,10 @@ in
]; ];
}; };
xf86videovmware = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
};
xdriinfo = attrs: attrs // { xdriinfo = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [args.mesa]; buildInputs = attrs.buildInputs ++ [args.mesa];
}; };

3
pkgs/top-level/all-packages.nix
View File

@ -5693,11 +5693,12 @@ let
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit fetchurl fetchsvn stdenv pkgconfig intltool freetype fontconfig inherit fetchurl fetchsvn stdenv pkgconfig intltool freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa libxslt expat libdrm libpng zlib perl mesa_drivers
xkeyboard_config dbus libuuid openssl gperf m4 xkeyboard_config dbus libuuid openssl gperf m4
autoconf libtool xmlto asciidoc udev flex bison python mtdev; autoconf libtool xmlto asciidoc udev flex bison python mtdev;
automake = automake110x; automake = automake110x;
pixman = pixman_cairo; pixman = pixman_cairo;
mesa = mesa_noglu;
}); });
xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };