diff options
| author | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-10-05 15:33:10 -0700 |
|---|---|---|
| committer | Benjamin Saunders <ben.e.saunders@gmail.com> | 2016-10-26 19:07:26 -0700 |
| commit | 5e45a6ce8fa8ed56f2aca828e056ad5f40980ec3 (patch) | |
| tree | c25b71b783e4ddbfe03f491af1f977e521e15381 /pkgs/development | |
| parent | 11acf1444ab7fbe6522a61731ea56af762c172bf (diff) | |
| download | nixpkgs-5e45a6ce8fa8ed56f2aca828e056ad5f40980ec3.tar nixpkgs-5e45a6ce8fa8ed56f2aca828e056ad5f40980ec3.tar.gz nixpkgs-5e45a6ce8fa8ed56f2aca828e056ad5f40980ec3.tar.bz2 nixpkgs-5e45a6ce8fa8ed56f2aca828e056ad5f40980ec3.tar.lz nixpkgs-5e45a6ce8fa8ed56f2aca828e056ad5f40980ec3.tar.xz nixpkgs-5e45a6ce8fa8ed56f2aca828e056ad5f40980ec3.tar.zst nixpkgs-5e45a6ce8fa8ed56f2aca828e056ad5f40980ec3.zip | |
mesa: enable intel vulkan driver
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index dd9302db952..5ff884fd3c1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, intltool, autoreconfHook, substituteAll -, file, expat, libdrm, xorg, wayland, systemd +, file, expat, libdrm, xorg, wayland, systemd, openssl , llvmPackages, libffi, libomxil-bellagio, libva , libelf, libvdpau, python2 , grsecEnabled ? false @@ -71,11 +71,13 @@ stdenv.mkDerivation { "--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri" "--with-egl-platforms=x11,wayland,drm" - (optionalString (stdenv.system != "armv7l-linux") - "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast") - (optionalString (stdenv.system != "armv7l-linux") - "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast") - + ] + ++ optionals (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-vulkan-drivers=intel" + ] + ++ [ (enableFeature enableTextureFloats "texture-float") (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") @@ -112,7 +114,7 @@ stdenv.mkDerivation { glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland libvdpau libelf libXvMC - libomxil-bellagio libva libpthreadstubs + libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ (python2.withPackages (ps: [ ps.Mako ])) ] ++ optional stdenv.isLinux systemd; @@ -134,8 +136,13 @@ stdenv.mkDerivation { $out/lib/vdpau \ $out/lib/bellagio \ $out/lib/libxatracker* \ + $out/lib/libvulkan_* \ + + # move share/vulkan/icd.d/ + mv $out/share/ $drivers/ mv $out/lib/dri/* $drivers/lib/dri + rmdir "$out/lib/dri" # move libOSMesa to $osmesa, as it's relatively big mkdir -p {$osmesa,$drivers}/lib/ |