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

mesa: enable intel vulkan driver

Browse Source
This commit is contained in:
Benjamin Saunders 2016-10-05 15:33:10 -07:00
parent 11acf1444a
commit 5e45a6ce8f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/mesa/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch { stdenv, fetchurl, fetchpatch
, pkgconfig, intltool, autoreconfHook, substituteAll , pkgconfig, intltool, autoreconfHook, substituteAll
, file, expat, libdrm, xorg, wayland, systemd , file, expat, libdrm, xorg, wayland, systemd, openssl
, llvmPackages, libffi, libomxil-bellagio, libva , llvmPackages, libffi, libomxil-bellagio, libva
, libelf, libvdpau, python2 , libelf, libvdpau, python2
, grsecEnabled ? false , grsecEnabled ? false
@ -71,11 +71,13 @@ stdenv.mkDerivation {
"--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${driverLink}/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri"
"--with-egl-platforms=x11,wayland,drm" "--with-egl-platforms=x11,wayland,drm"
(optionalString (stdenv.system != "armv7l-linux") ]
"--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") ++ optionals (stdenv.system != "armv7l-linux") [
(optionalString (stdenv.system != "armv7l-linux") "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
"--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
"--with-vulkan-drivers=intel"
]
++ [
(enableFeature enableTextureFloats "texture-float") (enableFeature enableTextureFloats "texture-float")
(enableFeature grsecEnabled "glx-rts") (enableFeature grsecEnabled "glx-rts")
(enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "dri3")
@ -112,7 +114,7 @@ stdenv.mkDerivation {
glproto dri2proto dri3proto presentproto glproto dri2proto dri3proto presentproto
libX11 libXext libxcb libXt libXfixes libxshmfence libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland libvdpau libelf libXvMC libffi wayland libvdpau libelf libXvMC
libomxil-bellagio libva libpthreadstubs libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
(python2.withPackages (ps: [ ps.Mako ])) (python2.withPackages (ps: [ ps.Mako ]))
] ++ optional stdenv.isLinux systemd; ] ++ optional stdenv.isLinux systemd;
@ -134,8 +136,13 @@ stdenv.mkDerivation {
$out/lib/vdpau \ $out/lib/vdpau \
$out/lib/bellagio \ $out/lib/bellagio \
$out/lib/libxatracker* \ $out/lib/libxatracker* \
$out/lib/libvulkan_* \
# move share/vulkan/icd.d/
mv $out/share/ $drivers/
mv $out/lib/dri/* $drivers/lib/dri mv $out/lib/dri/* $drivers/lib/dri
rmdir "$out/lib/dri"
# move libOSMesa to $osmesa, as it's relatively big # move libOSMesa to $osmesa, as it's relatively big
mkdir -p {$osmesa,$drivers}/lib/ mkdir -p {$osmesa,$drivers}/lib/