picnoir
/
libglvnd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glx: introduce NIX_GLVND_GLX_PATH env variable 

If NIX_GLVND_GLX_PATH is set, libglvnd will try to load the glx DSOs
from the directory it points at instead of loading them from LD_LIBRARY_PATH.
This commit is contained in:
Félix Baylac Jacqué 2022-11-15 16:27:16 +01:00
parent 58d49d7f1d
commit f4dff011f7
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/GLX/libglxmapping.c
View File

@ -407,7 +407,7 @@ __GLXvendorInfo *__glXLookupVendorByName(const char *vendorName)
if (!pEntry) { if (!pEntry) {
__GLXvendorInfo *vendor; __GLXvendorInfo *vendor;
__PFNGLXMAINPROC glxMainProc; __PFNGLXMAINPROC glxMainProc;
char *filename; char *filename, *nix_path;
int i, count; int i, count;
Bool success; Bool success;
@ -425,7 +425,24 @@ __GLXvendorInfo *__glXLookupVendorByName(const char *vendorName)
filename = ConstructVendorLibraryFilename(vendorName); filename = ConstructVendorLibraryFilename(vendorName);
if (filename) { if (filename) {
vendor->dlhandle = dlopen(filename, RTLD_LAZY); nix_path = secure_getenv("NIX_GLVND_GLX_PATH");
if(nix_path) {
size_t nix_path_len;
char* path_sep, *full_path;
nix_path_len = strlen(nix_path);
// Let's make sure we don't end up with a double
// slash in the path.
if (nix_path > 0 && nix_path[nix_path_len - 1] != '/') {
path_sep = "/";
} else {
path_sep = "";
}
glvnd_asprintf(&full_path, "%s%s%s", nix_path, path_sep, filename);
vendor->dlhandle = dlopen(full_path, RTLD_LAZY);
free(full_path);
} else {
vendor->dlhandle = dlopen(filename, RTLD_LAZY);
}
} }
free(filename); free(filename);
if (vendor->dlhandle == NULL) { if (vendor->dlhandle == NULL) {