Merge pull request #291559 from RyanGibb/libvpl-opengl-driver-search
This commit is contained in:
commit
b9c5225eb0
2 changed files with 28 additions and 0 deletions
19
pkgs/by-name/li/libvpl/opengl-driver-lib.patch
Normal file
19
pkgs/by-name/li/libvpl/opengl-driver-lib.patch
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
--- a/libvpl/src/mfx_dispatcher_vpl_loader.cpp
|
||||||
|
+++ b/libvpl/src/mfx_dispatcher_vpl_loader.cpp
|
||||||
|
@@ -548,6 +548,16 @@ mfxStatus LoaderCtxVPL::BuildListOfCandidateLibs() {
|
||||||
|
it++;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // fourth priority
|
||||||
|
+ searchDirList.clear();
|
||||||
|
+ searchDirList.push_back("@driverLink@/lib");
|
||||||
|
+ it = searchDirList.begin();
|
||||||
|
+ while (it != searchDirList.end()) {
|
||||||
|
+ STRING_TYPE nextDir = (*it);
|
||||||
|
+ sts = SearchDirForLibs(nextDir, m_libInfoList, LIB_PRIORITY_05);
|
||||||
|
+ it++;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
// lowest priority: legacy MSDK installation
|
||||||
|
searchDirList.clear();
|
||||||
|
GetSearchPathsLegacy(searchDirList);
|
|
@ -3,6 +3,8 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, substituteAll
|
||||||
|
, addDriverRunpath
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
|
@ -32,6 +34,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
"-DBUILD_TOOLS=OFF"
|
"-DBUILD_TOOLS=OFF"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(substituteAll {
|
||||||
|
src = ./opengl-driver-lib.patch;
|
||||||
|
inherit (addDriverRunpath) driverLink;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Intel Video Processing Library";
|
description = "Intel Video Processing Library";
|
||||||
homepage = "https://intel.github.io/libvpl/";
|
homepage = "https://intel.github.io/libvpl/";
|
||||||
|
|
Loading…
Reference in a new issue