diff options
| author | Alyssa <hi@alyssa.is> | 2019-04-18 12:03:05 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-23 09:59:32 +0000 |
| commit | 8e5bb649c29e338e285b785f4a07fae69adcf071 (patch) | |
| tree | 5b821a04bd8f2876c1d8ac1e6ad4200029d51c42 /nixpkgs/pkgs/development/libraries/mesa/default.nix | |
| parent | 8f6fa94edce15a4d4d7357d3f39693b3047660cb (diff) | |
| download | nixlib-8e5bb649c29e338e285b785f4a07fae69adcf071.tar nixlib-8e5bb649c29e338e285b785f4a07fae69adcf071.tar.gz nixlib-8e5bb649c29e338e285b785f4a07fae69adcf071.tar.bz2 nixlib-8e5bb649c29e338e285b785f4a07fae69adcf071.tar.lz nixlib-8e5bb649c29e338e285b785f4a07fae69adcf071.tar.xz nixlib-8e5bb649c29e338e285b785f4a07fae69adcf071.tar.zst nixlib-8e5bb649c29e338e285b785f4a07fae69adcf071.zip | |
mesa: make va support optional
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 6d7d78adf8ee..984ffe06febc 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages, libffi, libva-minimal +, llvmPackages, libffi , libelf, libvdpau, valgrind-light, python2, python2Packages , libglvnd , enableRadv ? true @@ -11,6 +11,7 @@ , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , omxBellagioSupport ? stdenv.isLinux, libomxil-bellagio +, vaSupport ? stdenv.isLinux, libva-minimal , OpenGL, Xplugin }: @@ -71,6 +72,8 @@ in assert omxBellagioSupport -> intersectLists galliumDrivers [ "r600" "radeonsi" "nouveau" ] != []; +assert vaSupport -> + intersectLists galliumDrivers [ "r600" "radeonsi" "nouveau" ] != []; let version = "18.3.4"; @@ -155,11 +158,7 @@ let self = stdenv.mkDerivation { "--enable-shared-glapi" "--enable-llvm-shared-libs" (enableFeature omxBellagioSupport "omx-bellagio") - - (enableFeature (elem "x11" eglPlatforms - || elem "wayland" eglPlatforms - || elem "drm" eglPlatforms) "va") - + (enableFeature vaSupport "va") "--disable-opencl" "--with-d3d-libdir=$(drivers)/lib" @@ -180,7 +179,7 @@ let self = stdenv.mkDerivation { buildInputs = [ expat llvmPackages.llvm libglvnd libelf ] ++ optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ optionals stdenv.isLinux [ libva-minimal ] + ++ optional vaSupport libva-minimal ++ optional omxBellagioSupport libomxil-bellagio ++ optionals (elem "x11" eglPlatforms) |