From 2222222b0f41747f14fcbeb20a03c7dfc16b9389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 18:24:41 +0200 Subject: [PATCH 1/2] libva: build minimal without a dependency on wayland This fixes issues with environment.noXLibs --- pkgs/development/libraries/libva/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index d7a7f43e7e80..15fb761aec15 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -26,7 +26,8 @@ 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 ]; From 55555553a33fbc6bc880fcb5d62b6683dd7f8e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 19:55:10 +0200 Subject: [PATCH 2/2] libva: remove libva-minimal input This is not actually a compile time dependency and sharing libs is not worth the it because libva compiles in just a few seconds --- pkgs/development/libraries/libva/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 15fb761aec15..7260030df0df 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 @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { ++ 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