From 82961432f9b49578dbe56cf0ae8db632e62cbbcb Mon Sep 17 00:00:00 2001 From: mtgmonkey Date: Thu, 11 Dec 2025 22:49:07 +0100 Subject: [PATCH] remove Wayland; couldn't figure out --- CHANGELOG.md | 12 ++++++++++++ Setup.hs | 12 ------------ flake.nix | 20 -------------------- hs-rgfw.cabal | 6 +----- lib/RGFW_HS.h | 4 +--- 5 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 Setup.hs diff --git a/CHANGELOG.md b/CHANGELOG.md index c23f854..2b91845 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) - support for actually doing anything - autogen code +## [0.1.0.1] -- 2025-12-11 + +- does removing wayland but leaving the API intact count as breaking? + +### Changed + +- no more dependencies on wayland libraries or xkbcommon + +### Removed + +- any semblance of Wayland support; use wayland-satelite or something + ## [0.1.0.0] -- 2025-12-10 ### Removed diff --git a/Setup.hs b/Setup.hs deleted file mode 100644 index 938b9c1..0000000 --- a/Setup.hs +++ /dev/null @@ -1,12 +0,0 @@ -{-# LANGUAGE CPP #-} - -module Main (main) where - -import Distribution.Simple (defaultMain) -import System.Process (callCommand) - -main :: IO () -main = do - callCommand "./scripts/generate.sh" - defaultMain - callCommand "./scripts/delete-generated.sh" diff --git a/flake.nix b/flake.nix index c95ded2..0a0d23d 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,6 @@ lib, libGL, libX11, - libxkbcommon, - wayland, xcursor, xi, xrandr, @@ -24,20 +22,6 @@ pname = "hs-rgfw"; version = "0.1.0.0"; src = ./.; - preBuild = '' - ${lib.getExe pkgs.wayland-scanner} public-code ${pkgs.wayland-protocols}/share/wayland-protocols/stable/xdg-shell/xdg-shell.xml ./lib/xdg-shell.c - ${lib.getExe pkgs.wayland-scanner} public-code ${pkgs.wayland-protocols}/share/wayland-protocols/staging/xdg-toplevel-icon/xdg-toplevel-icon-v1.xml ./lib/xdg-toplevel-icon-v1.c - ${lib.getExe pkgs.wayland-scanner} public-code ${pkgs.wayland-protocols}/share/wayland-protocols/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ./lib/xdg-decoration-unstable-v1.c - ${lib.getExe pkgs.wayland-scanner} public-code ${pkgs.wayland-protocols}/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml ./lib/relative-pointer-unstable-v1.c - ${lib.getExe pkgs.wayland-scanner} public-code ${pkgs.wayland-protocols}/share/wayland-protocols/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ./lib/pointer-constraints-unstable-v1.c - ${lib.getExe pkgs.wayland-scanner} public-code ${pkgs.wayland-protocols}/share/wayland-protocols/unstable/xdg-output/xdg-output-unstable-v1.xml ./lib/xdg-output-unstable-v1.c - ${lib.getExe pkgs.wayland-scanner} client-header ${pkgs.wayland-protocols}/share/wayland-protocols/stable/xdg-shell/xdg-shell.xml ./lib/xdg-shell.h - ${lib.getExe pkgs.wayland-scanner} client-header ${pkgs.wayland-protocols}/share/wayland-protocols/staging/xdg-toplevel-icon/xdg-toplevel-icon-v1.xml ./lib/xdg-toplevel-icon-v1.h - ${lib.getExe pkgs.wayland-scanner} client-header ${pkgs.wayland-protocols}/share/wayland-protocols/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml ./lib/xdg-decoration-unstable-v1.h - ${lib.getExe pkgs.wayland-scanner} client-header ${pkgs.wayland-protocols}/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml ./lib/relative-pointer-unstable-v1.h - ${lib.getExe pkgs.wayland-scanner} client-header ${pkgs.wayland-protocols}/share/wayland-protocols/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ./lib/pointer-constraints-unstable-v1.h - ${lib.getExe pkgs.wayland-scanner} client-header ${pkgs.wayland-protocols}/share/wayland-protocols/unstable/xdg-output/xdg-output-unstable-v1.xml ./lib/xdg-output-unstable-v1.h - ''; libraryHaskellDepends = [ base ]; @@ -45,14 +29,10 @@ gl libGL libX11 - libxkbcommon - wayland xcursor xi xrandr ]; - postInstall = '' - ''; homepage = "https://git.mtgmonkey.net/Andromeda/hs-rgfw"; license = lib.licenses.bsd3; platforms = ["x86_64-linux"]; diff --git a/hs-rgfw.cabal b/hs-rgfw.cabal index ee31a85..25b9910 100644 --- a/hs-rgfw.cabal +++ b/hs-rgfw.cabal @@ -3,7 +3,7 @@ name: hs-rgfw -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -version: 0.1.0.0 +version: 0.1.0.1 -- A short (one-line) description of the package. -- synopsis: -- A longer description of the package. @@ -44,10 +44,6 @@ library base >=4.18 pkgconfig-depends: gl, - wayland-client, - wayland-egl, - wayland-cursor, - xkbcommon, x11, xcursor, xrandr, diff --git a/lib/RGFW_HS.h b/lib/RGFW_HS.h index c511cf6..dcd6e47 100644 --- a/lib/RGFW_HS.h +++ b/lib/RGFW_HS.h @@ -5,12 +5,10 @@ #define RGFW_IMPLEMENTATION #define RGFW_DEBUG -#define RGFW_X11 -#define RGFW_WAYLAND #define RGFW_OPENGL #define Time X11Time // fixes namespace clash with GHC when building with Nix #include "RGFW.h" #undef Time -#endif RGFW_HS +#endif