Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libva: build minimal without a dependency on wayland #233449

Merged
merged 2 commits into from
Jun 27, 2023
Merged

libva: build minimal without a dependency on wayland #233449

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2222222
libva: build minimal without a dependency on wayland
SuperSandro2000 May 22, 2023
5555555
libva: remove libva-minimal input
SuperSandro2000 May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/development/libraries/libva/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, meson, pkg-config, ninja, wayland-scanner
, libdrm
, minimal ? false, libva-minimal
, minimal ? false
, libX11, libXext, libXfixes, wayland, libffi, libGL
, mesa
# for passthru.tests
Expand All @@ -26,11 +26,11 @@ stdenv.mkDerivation rec {

depsBuildBuild = [ pkg-config ];

nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ];
nativeBuildInputs = [ meson pkg-config ninja ]
++ lib.optional (!minimal) wayland-scanner;

buildInputs = [ libdrm ]
++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ];
# TODO: share libs between minimal and !minimal - perhaps just symlink them
++ lib.optionals (!minimal) [ libX11 libXext libXfixes wayland libffi libGL ];

mesonFlags = [
# Add FHS and Debian paths for non-NixOS applications
Expand Down