From 22ff7852057f2a4961a408dd88d982a5ce1ea811 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 31 May 2020 00:33:18 +0900 Subject: [PATCH 1/2] intel-media-sdk: remove samples fix #88939 --- .../libraries/intel-media-sdk/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 411cc227b304..a43c93ca7fc0 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, autoPatchelfHook, cmake, pkgconfig, libdrm, libpciaccess -, libva , libX11, libXau, libXdmcp, libpthreadstubs -}: +{ stdenv, fetchurl, cmake, pkgconfig, libdrm, libpciaccess, libva +, libX11 , libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { pname = "intel-media-sdk"; @@ -11,12 +10,15 @@ stdenv.mkDerivation rec { sha256 = "1p13b4abslq31pbgqf0bzs2ixns85yfdsm94326h2vcg0q7hqc24"; }; - # patchelf is needed for binaries in $out/share/samples - nativeBuildInputs = [ autoPatchelfHook cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs ]; + cmakeFlags = [ + "-DBUILD_SAMPLES=OFF" + ]; + enableParallelBuild = true; meta = with stdenv.lib; { From 4983263166a933eed9c5c818794608a77eea6403 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 31 May 2020 01:26:50 +0900 Subject: [PATCH 2/2] intel-media-sdk: enable unit tests --- pkgs/development/libraries/intel-media-sdk/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index a43c93ca7fc0..03b3b936f261 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libdrm, libpciaccess, libva -, libX11 , libXau, libXdmcp, libpthreadstubs }: +{ stdenv, fetchurl, cmake, pkgconfig, gtest, libdrm, libpciaccess, libva, libX11 +, libXau, libXdmcp, libpthreadstubs }: stdenv.mkDerivation rec { pname = "intel-media-sdk"; @@ -14,11 +14,15 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs ]; + checkInputs = [ gtest ]; cmakeFlags = [ "-DBUILD_SAMPLES=OFF" + "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DUSE_SYSTEM_GTEST=ON" ]; + doCheck = true; enableParallelBuild = true; meta = with stdenv.lib; {