From fbf94f5a7d3d77debd3eab96b601df077953ae44 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 21 Nov 2024 22:50:06 +0100 Subject: [PATCH] glfw3: harden wayland substitutions Including quotes around the library names should make these substitutions stricter. Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/gl/glfw3/package.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix index b098896a9859..d597d79aaa61 100644 --- a/pkgs/by-name/gl/glfw3/package.nix +++ b/pkgs/by-name/gl/glfw3/package.nix @@ -63,17 +63,13 @@ stdenv.mkDerivation { postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/wl_init.c \ - --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" + --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"' \ + --replace-fail '"libxkbcommon.so.0"' '"${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0"' ''; - # glfw may dlopen libwayland-client.so: - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf ''${!outputLib}/lib/libglfw.so --add-rpath ${lib.getLib wayland}/lib - ''; cmakeFlags = [ # Static linking isn't supported