From 543efca465ee63602491b5e05f15e5e8e18bea80 Mon Sep 17 00:00:00 2001 From: someplaceguy Date: Sun, 30 Jun 2024 01:54:40 +0000 Subject: [PATCH] glfw: add missing substitutions in glfw3 This fixes the same issue that #276228 addressed, but in the regular edition instead. --- pkgs/development/libraries/glfw/3.x.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 67d5a0095148..b10a39282de8 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -2,7 +2,7 @@ , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames , extra-cmake-modules, wayland -, wayland-scanner, wayland-protocols, libxkbcommon +, wayland-scanner, wayland-protocols, libxkbcommon, libdecor }: stdenv.mkDerivation rec { @@ -50,7 +50,11 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/wl_init.c \ - --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" + --replace-fail "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" \ + --replace-fail "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" \ + --replace-fail "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" \ + --replace-fail "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" \ + --replace-fail "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" ''; # glfw may dlopen libwayland-client.so: