diff options
author | Will Dietz <github@wdtz.org> | 2018-04-02 14:49:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-02 14:49:35 -0500 |
commit | f48197ead50c47606df9b1c2bf1ec65b6db71959 (patch) | |
tree | f039215d4b8afb81800d4256b9efeb483b09b15f /pkgs | |
parent | 00ffbc4b8c97072a414ce47ad7c66d5d7d9cc3c5 (diff) | |
parent | 503f8efbcd2734eedaf3d0913dc4d1e5f7e89052 (diff) | |
download | nixlib-f48197ead50c47606df9b1c2bf1ec65b6db71959.tar nixlib-f48197ead50c47606df9b1c2bf1ec65b6db71959.tar.gz nixlib-f48197ead50c47606df9b1c2bf1ec65b6db71959.tar.bz2 nixlib-f48197ead50c47606df9b1c2bf1ec65b6db71959.tar.lz nixlib-f48197ead50c47606df9b1c2bf1ec65b6db71959.tar.xz nixlib-f48197ead50c47606df9b1c2bf1ec65b6db71959.tar.zst nixlib-f48197ead50c47606df9b1c2bf1ec65b6db71959.zip |
Merge pull request #38168 from dtzWill/fix/epoxy-libgl-path
epoxy: explicitly search libGL path as fallback
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/epoxy/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/epoxy/libgl-path.patch | 35 |
2 files changed, 38 insertions, 4 deletions
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 81966f14a568..e0f8e9ff8c76 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -25,10 +25,9 @@ stdenv.mkDerivation rec { substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" ''; - # add libGL to rpath because libepoxy dlopen()s libEGL - postFixup = optionalString stdenv.isLinux '' - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libGL ]}:$(patchelf --print-rpath $out/lib/libepoxy.so.0.0.0)" $out/lib/libepoxy.so.0.0.0 - ''; + patches = [ ./libgl-path.patch ]; + + NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; meta = { description = "A library for handling OpenGL function pointer management"; diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch new file mode 100644 index 000000000000..6f50b9d262b5 --- /dev/null +++ b/pkgs/development/libraries/epoxy/libgl-path.patch @@ -0,0 +1,35 @@ +From 4046e0ac8ed93354c01de5f3b5cae790cce70404 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 29 Mar 2018 07:21:02 -0500 +Subject: [PATCH] Explicitly search LIBGL_PATH as fallback, if defined. + +--- + src/dispatch_common.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/dispatch_common.c b/src/dispatch_common.c +index bc2fb94..776237b 100644 +--- a/src/dispatch_common.c ++++ b/src/dispatch_common.c +@@ -306,6 +306,18 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail) + pthread_mutex_lock(&api.mutex); + if (!*handle) { + *handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL); ++#ifdef LIBGL_PATH ++ if (!*handle) { ++ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1]; ++ int l = snprintf(pathbuf, sizeof(pathbuf), "%s/%s", LIBGL_PATH, lib_name); ++ if (l < 0 || l >= sizeof(pathbuf)) { ++ // This really shouldn't happen ++ fprintf(stderr, "Error prefixing library pathname\n"); ++ exit(1); ++ } ++ *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL); ++ } ++#endif + if (!*handle) { + if (exit_on_fail) { + fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror()); +-- +2.16.3 + |