JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

epoxy: 1.5.1 -> 1.5.2 (#47178)

Browse Source 
libgl-path.patch was updated (it applied with little fuzz, because I am
a bit lazy, and rebase it on master of epoxy, not 1.5.2)
This commit is contained in:
Alexander V. Nikolaev 2018-09-25 12:50:51 +03:00 committed by xeji
parent 588b524933
commit 867d387a1c
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/epoxy/default.nix
View File

@ -6,13 +6,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "epoxy-${version}"; name = "epoxy-${version}";
version = "1.5.1"; version = "1.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anholt"; owner = "anholt";
repo = "libepoxy"; repo = "libepoxy";
rev = "${version}"; rev = "${version}";
sha256 = "1811agxr7g9wd832np8sw152j468kg3qydmfkc564v54ncfcgaci"; sha256 = "0frs42s7d3ff2wlw0jns6vb3myx2bhz9m5nkzbnfyn436s2qqls3";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

25
pkgs/development/libraries/epoxy/libgl-path.patch
View File

@ -1,20 +1,11 @@
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 diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index bc2fb94..776237b 100644 index b3e4f5f..303e8f5 100644
--- a/src/dispatch_common.c --- a/src/dispatch_common.c
+++ b/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) @@ -310,6 +310,19 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l
pthread_mutex_lock(&api.mutex); flags |= RTLD_NOLOAD;
if (!*handle) {
*handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL); *handle = dlopen(lib_name, flags);
+#ifdef LIBGL_PATH +#ifdef LIBGL_PATH
+ if (!*handle) { + if (!*handle) {
+ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1]; + char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1];
@ -24,12 +15,10 @@ index bc2fb94..776237b 100644
+ fprintf(stderr, "Error prefixing library pathname\n"); + fprintf(stderr, "Error prefixing library pathname\n");
+ exit(1); + exit(1);
+ } + }
+ *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL); + *handle = dlopen(pathbuf, flags);
+ } + }
+#endif +#endif
+
if (!*handle) { if (!*handle) {
if (exit_on_fail) { if (exit_on_fail) {
fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror()); fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror());
--
2.16.3