uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,74 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, utilmacros
, python3
, libGL
, libX11
, Carbon
, OpenGL
, x11Support ? !stdenv.isDarwin
}:
let
inherit (lib) getLib optional optionalString;
in
stdenv.mkDerivation rec {
pname = "libepoxy";
version = "1.5.10";
src = fetchFromGitHub {
owner = "anholt";
repo = pname;
rev = version;
sha256 = "sha256-gZiyPOW2PeTMILcPiUTqPUGRNlMM5mI1z9563v4SgEs=";
};
patches = [ ./libgl-path.patch ];
postPatch = ''
patchShebangs src/*.py
''
+ optionalString stdenv.isDarwin ''
substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
'';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ];
buildInputs = lib.optionals x11Support [
libGL
libX11
] ++ lib.optionals stdenv.isDarwin [
Carbon
OpenGL
];
mesonFlags = [
"-Dtests=${if doCheck then "true" else "false"}"
"-Dglx=${if x11Support then "yes" else "no"}"
];
NIX_CFLAGS_COMPILE = lib.optionalString x11Support ''-DLIBGL_PATH="${getLib libGL}/lib"'';
# cgl_epoxy_api fails in darwin sandbox and on Hydra (because it's headless?)
preCheck = lib.optionalString stdenv.isDarwin ''
substituteInPlace ../test/meson.build \
--replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
'';
doCheck = true;
meta = with lib; {
description = "A library for handling OpenGL function pointer management";
homepage = "https://github.com/anholt/libepoxy";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu erictapen ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,24 @@
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index b3e4f5f..303e8f5 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -310,6 +310,19 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l
flags |= RTLD_NOLOAD;
*handle = dlopen(lib_name, flags);
+#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, flags);
+ }
+#endif
+
if (!*handle) {
if (exit_on_fail) {
fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror());