diff options
Diffstat (limited to 'pkgs/development/libraries/glfw/3.x.nix')
-rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 67d5a0095148b..2ec1f42d2840f 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext -, Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames +, Carbon, Cocoa, Kernel, fixDarwinDylibNames , extra-cmake-modules, wayland -, wayland-scanner, wayland-protocols, libxkbcommon +, wayland-scanner, wayland-protocols, libxkbcommon, libdecor }: stdenv.mkDerivation rec { @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) patches = ./x11.patch; - propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ OpenGL ] - ++ lib.optionals stdenv.isLinux [ libGL ]; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake extra-cmake-modules ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames @@ -50,7 +48,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: |