diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-20 21:03:19 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-23 10:01:48 +0000 |
| commit | ef3c53a9174d297f258cf4e45bef712de9a2359c (patch) | |
| tree | e66b4b660b4f9f6ffa2d55f2d80c264f5d97d2a7 /nixpkgs/pkgs/development/libraries/mesa/default.nix | |
| parent | 841a9ed72aad6977f5ddf8292d9bdeec1ab5b31f (diff) | |
| download | nixlib-ef3c53a9174d297f258cf4e45bef712de9a2359c.tar nixlib-ef3c53a9174d297f258cf4e45bef712de9a2359c.tar.gz nixlib-ef3c53a9174d297f258cf4e45bef712de9a2359c.tar.bz2 nixlib-ef3c53a9174d297f258cf4e45bef712de9a2359c.tar.lz nixlib-ef3c53a9174d297f258cf4e45bef712de9a2359c.tar.xz nixlib-ef3c53a9174d297f258cf4e45bef712de9a2359c.tar.zst nixlib-ef3c53a9174d297f258cf4e45bef712de9a2359c.zip | |
mesa: make XvMC support optional
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index a438b4a748c3..b72881189e5a 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -10,6 +10,7 @@ , vulkanDrivers ? null , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] +, xvmcSupport ? true , vdpauSupport ? true, libvdpau , omxBellagioSupport ? stdenv.isLinux, libomxil-bellagio , vaSupport ? stdenv.isLinux, libva-minimal @@ -19,6 +20,7 @@ with lib; +assert xvmcSupport -> elem "x11" eglPlatforms; assert vdpauSupport -> elem "x11" eglPlatforms; /** Packaging design: @@ -73,6 +75,8 @@ let else vulkan_; in +assert xvmcSupport -> + elem "r600" galliumDrivers || elem "nouveau" galliumDrivers; assert omxBellagioSupport -> intersectLists galliumDrivers [ "r600" "radeonsi" "nouveau" ] != []; assert vaSupport -> @@ -158,7 +162,7 @@ let self = stdenv.mkDerivation { (enableFeature (any (d: d != "swrast") galliumDrivers) "xa") (enableFeature stdenv.isLinux "gbm") - (enableFeature (elem "x11" eglPlatforms) "xvmc") + (enableFeature xvmcSupport "xvmc") (enableFeature vdpauSupport "vdpau") "--enable-shared-glapi" "--enable-llvm-shared-libs" @@ -184,6 +188,7 @@ let self = stdenv.mkDerivation { buildInputs = [ expat llvmPackages.llvm libglvnd libelf ] ++ optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] + ++ optional xvmcSupport xorg.libXvMC ++ optional vdpauSupport libvdpau ++ optional vaSupport libva-minimal ++ optional omxBellagioSupport libomxil-bellagio @@ -192,7 +197,7 @@ let self = stdenv.mkDerivation { ((with xorg; [ xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr - libffi libXvMC + libffi libpthreadstubs openssl /*or another sha1 provider*/ ]) ++ optional stdenv.isLinux valgrind-light); |