From 6848829643338b4d6215f2b52c9ec0aa00312f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 17 Aug 2024 00:11:47 +0200 Subject: [PATCH] libva: cleanup --- pkgs/development/libraries/libva/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 20ce67456c6a..8a41c60b169f 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -38,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: { "-Ddriverdir=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" ]; + env = lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") { + NIX_LDFLAGS = "--undefined-version"; + } // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) { + NIX_CFLAGS_COMPILE = "-DHAVE_SECURE_GETENV"; + }; + passthru.tests = { # other drivers depending on libva and selected application users. # Please get a confirmation from the maintainer before adding more applications. @@ -66,8 +72,4 @@ stdenv.mkDerivation (finalAttrs: { lib.systems.inspect.platformPatterns.isStatic ]; }; -} // lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") { - NIX_LDFLAGS = "--undefined-version"; -} // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) { - NIX_CFLAGS_COMPILE = "-DHAVE_SECURE_GETENV"; })