diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-06-27 18:06:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-27 18:06:44 +0200 |
| commit | ab0ffb36a3fddb3bf5256a2eca44e52103b78114 (patch) | |
| tree | 80b8520ede495c41e82f4b9722dd8656ee56144d /pkgs/development/libraries/libva | |
| parent | d698c07d158ba2abe720954e9a9e4015ef4ff034 (diff) | |
| parent | 55555553a33fbc6bc880fcb5d62b6683dd7f8e95 (diff) | |
| download | nixlib-ab0ffb36a3fddb3bf5256a2eca44e52103b78114.tar nixlib-ab0ffb36a3fddb3bf5256a2eca44e52103b78114.tar.gz nixlib-ab0ffb36a3fddb3bf5256a2eca44e52103b78114.tar.bz2 nixlib-ab0ffb36a3fddb3bf5256a2eca44e52103b78114.tar.lz nixlib-ab0ffb36a3fddb3bf5256a2eca44e52103b78114.tar.xz nixlib-ab0ffb36a3fddb3bf5256a2eca44e52103b78114.tar.zst nixlib-ab0ffb36a3fddb3bf5256a2eca44e52103b78114.zip | |
Merge pull request #233449 from SuperSandro2000/libva-nox
libva: build minimal without a dependency on wayland
Diffstat (limited to 'pkgs/development/libraries/libva')
| -rw-r--r-- | pkgs/development/libraries/libva/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index a271c24d9dab..8d602a8c70b1 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -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 @@ -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 |