From d8ca87bfd822df6bc8582f1f822c93ee9b75db33 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Tue, 26 Nov 2024 21:23:50 +0000 Subject: [PATCH] pkgs: Remove glfw-wayland-minecraft --- pkgs/default.nix | 1 - pkgs/glfw-minecraft/default.nix | 6 --- .../suppress-wayland-errors.patch | 43 ------------------- 3 files changed, 50 deletions(-) delete mode 100644 pkgs/glfw-minecraft/default.nix delete mode 100644 pkgs/glfw-minecraft/suppress-wayland-errors.patch diff --git a/pkgs/default.nix b/pkgs/default.nix index 7bbac2f..ef73008 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -8,7 +8,6 @@ in vfio-pci-bind = callPackage ./vfio-pci-bind.nix { }; librespeed-go = callPackage ./librespeed-go.nix { }; # modrinth-app = callPackage ./modrinth-app { }; - glfw-minecraft = callPackage ./glfw-minecraft { }; chocolate-doom2xx = callPackage ./chocolate-doom2xx { }; windowtolayer = callPackage ./windowtolayer.nix { }; swaylock-plugin = callPackage ./swaylock-plugin.nix { }; diff --git a/pkgs/glfw-minecraft/default.nix b/pkgs/glfw-minecraft/default.nix deleted file mode 100644 index 6913557..0000000 --- a/pkgs/glfw-minecraft/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, glfw-wayland-minecraft, ... }: -glfw-wayland-minecraft.overrideAttrs (o: { - patches = [ - ./suppress-wayland-errors.patch - ]; -}) diff --git a/pkgs/glfw-minecraft/suppress-wayland-errors.patch b/pkgs/glfw-minecraft/suppress-wayland-errors.patch deleted file mode 100644 index c0984db..0000000 --- a/pkgs/glfw-minecraft/suppress-wayland-errors.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/wl_window.c b/src/wl_window.c -index 7c509896..db9a6451 100644 ---- a/src/wl_window.c -+++ b/src/wl_window.c -@@ -2115,25 +2115,21 @@ void _glfwSetWindowTitleWayland(_GLFWwindow* window, const char* title) - void _glfwSetWindowIconWayland(_GLFWwindow* window, - int count, const GLFWimage* images) - { -- _glfwInputError(GLFW_FEATURE_UNAVAILABLE, -- "Wayland: The platform does not support setting the window icon"); -+ fprintf(stderr, "!!! Ignoring Error: Wayland: The platform does not support setting the window icon\n"); - } - - void _glfwGetWindowPosWayland(_GLFWwindow* window, int* xpos, int* ypos) - { - // A Wayland client is not aware of its position, so just warn and leave it - // as (0, 0) -- -- _glfwInputError(GLFW_FEATURE_UNAVAILABLE, -- "Wayland: The platform does not provide the window position"); -+ fprintf(stderr, "!!! Ignoring Error: Wayland: The platform does not provide the window position\n"); - } - - void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos) - { - // A Wayland client can not set its position, so just warn - -- _glfwInputError(GLFW_FEATURE_UNAVAILABLE, -- "Wayland: The platform does not support setting the window position"); -+ fprintf(stderr, "!!! Ignoring Error: Wayland: The platform does not support setting the window position\n"); - } - - void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height) -@@ -2359,8 +2355,7 @@ void _glfwRequestWindowAttentionWayland(_GLFWwindow* window) - - void _glfwFocusWindowWayland(_GLFWwindow* window) - { -- _glfwInputError(GLFW_FEATURE_UNAVAILABLE, -- "Wayland: The platform does not support setting the input focus"); -+ fprintf(stderr, "!!! Ignoring Error: Wayland: The platform does not support setting the input focus\n"); - } - - void _glfwSetWindowMonitorWayland(_GLFWwindow* window,