diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-09 08:42:04 +0100 |
| commit | 6bea415b5e3f4ab70afcea4c646ad76d9c073c89 (patch) | |
| tree | 8f5e976cd8aecc6029b4019e16f0177e0a66a093 /pkgs/development/libraries/mesa | |
| parent | b846a53d2a3cba3002a4d6fb064f579677eac52c (diff) | |
| parent | 4bf9f8afc39e9d0c0629635652804b81fe3e3332 (diff) | |
| download | nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.gz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.bz2 nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.lz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.xz nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.zst nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e9e3c04a7a67..abca82e62979 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -4,6 +4,7 @@ , llvmPackages, libffi, libomxil-bellagio, libva , libelf, libvdpau, python2 , grsecEnabled ? false +, enableRadv ? false , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt }: @@ -73,7 +74,7 @@ stdenv.mkDerivation { ] else [ "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,swrast" "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast" - "--with-vulkan-drivers=intel" + ("--with-vulkan-drivers=intel" + optionalString enableRadv ",radeon") ]) ++ [ (enableFeature enableTextureFloats "texture-float") (enableFeature grsecEnabled "glx-rts") |