diff options
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 5bc1dfaf8783..0baf2fa6d4e2 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -104,6 +104,7 @@ let self = stdenv.mkDerivation { "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri" + "--with-va-libdir=$(drivers)/lib/dri" "--with-platforms=${concatStringsSep "," eglPlatforms}" "--with-gallium-drivers=${concatStringsSep "," galliumDrivers}" "--with-dri-drivers=${concatStringsSep "," driDrivers}" @@ -132,6 +133,11 @@ let self = stdenv.mkDerivation { (enableFeature stdenv.isLinux "omx-bellagio") (enableFeature stdenv.isLinux "va") "--disable-opencl" + + "--with-d3d-libdir=$(drivers)/lib" + "--with-xvmc-libdir=$(drivers)/lib" + "--with-vdpau-libdir=$(drivers)/lib" + "--with-omx-bellagio-libdir=$(drivers)/lib" ]; nativeBuildInputs = [ @@ -168,16 +174,10 @@ let self = stdenv.mkDerivation { '' + optionalString (galliumDrivers != []) '' # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM mv -t "$drivers/lib/" \ - $out/lib/libXvMC* \ - $out/lib/d3d \ - $out/lib/vdpau \ - $out/lib/bellagio \ $out/lib/libxatracker* \ $out/lib/libvulkan_* # Move other drivers to a separate output - mv $out/lib/dri/* $drivers/lib/dri # */ - rmdir "$out/lib/dri" mv $out/lib/lib*_mesa* $drivers/lib # move libOSMesa to $osmesa, as it's relatively big |