movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #233449 from SuperSandro2000/libva-nox

Browse source 
libva: build minimal without a dependency on wayland
This commit is contained in:
Sandro 2023-06-27 18:06:44 +02:00 • committed by GitHub
commit ab0ffb36a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/libva/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, meson, pkg-config, ninja, wayland-scanner { stdenv, lib, fetchFromGitHub, meson, pkg-config, ninja, wayland-scanner
, libdrm , libdrm
, minimal ? false, libva-minimal , minimal ? false
, libX11, libXext, libXfixes, wayland, libffi, libGL , libX11, libXext, libXfixes, wayland, libffi, libGL
, mesa , mesa
# for passthru.tests # for passthru.tests
@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ pkg-config ]; depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ]; nativeBuildInputs = [ meson pkg-config ninja ]
++ lib.optional (!minimal) wayland-scanner;
buildInputs = [ libdrm ] buildInputs = [ libdrm ]
++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; ++ lib.optionals (!minimal) [ libX11 libXext libXfixes wayland libffi libGL ];
# TODO: share libs between minimal and !minimal - perhaps just symlink them
mesonFlags = [ mesonFlags = [
# Add FHS and Debian paths for non-NixOS applications # Add FHS and Debian paths for non-NixOS applications