From b869f7d909562d04dd19183321fd84d8c9c17e4b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:50:25 +0200 Subject: [PATCH] supersonic: drop glfw3.buildInputs --- pkgs/by-name/su/supersonic/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 9de886758526..9b0fe4fd0634 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -7,9 +7,11 @@ , pkg-config , desktopToDarwinBundle , xorg +, wayland +, wayland-protocols +, libxkbcommon , libglvnd , mpv -, glfw3 , darwin , waylandSupport ? false }: @@ -45,10 +47,17 @@ buildGoModule rec { ] ++ lib.optionals stdenv.isLinux [ xorg.libXxf86vm xorg.libX11 - ] - ++ (builtins.filter (p: !(lib.hasPrefix "apple-framework" p.name)) - (glfw3.override { inherit waylandSupport; }).buildInputs) - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ + xorg.libXrandr + xorg.libXinerama + xorg.libXcursor + xorg.libXi + xorg.libXext + ] ++ lib.optionals (stdenv.isLinux && waylandSupport) [ + wayland + wayland-protocols + libxkbcommon + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.Kernel darwin.apple_sdk_11_0.frameworks.OpenGL