remove Wayland; couldn't figure out
This commit is contained in:
12
CHANGELOG.md
12
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
|
- support for actually doing anything
|
||||||
- autogen code
|
- 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
|
## [0.1.0.0] -- 2025-12-10
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|||||||
12
Setup.hs
12
Setup.hs
@@ -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"
|
|
||||||
20
flake.nix
20
flake.nix
@@ -14,8 +14,6 @@
|
|||||||
lib,
|
lib,
|
||||||
libGL,
|
libGL,
|
||||||
libX11,
|
libX11,
|
||||||
libxkbcommon,
|
|
||||||
wayland,
|
|
||||||
xcursor,
|
xcursor,
|
||||||
xi,
|
xi,
|
||||||
xrandr,
|
xrandr,
|
||||||
@@ -24,20 +22,6 @@
|
|||||||
pname = "hs-rgfw";
|
pname = "hs-rgfw";
|
||||||
version = "0.1.0.0";
|
version = "0.1.0.0";
|
||||||
src = ./.;
|
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 = [
|
libraryHaskellDepends = [
|
||||||
base
|
base
|
||||||
];
|
];
|
||||||
@@ -45,14 +29,10 @@
|
|||||||
gl
|
gl
|
||||||
libGL
|
libGL
|
||||||
libX11
|
libX11
|
||||||
libxkbcommon
|
|
||||||
wayland
|
|
||||||
xcursor
|
xcursor
|
||||||
xi
|
xi
|
||||||
xrandr
|
xrandr
|
||||||
];
|
];
|
||||||
postInstall = ''
|
|
||||||
'';
|
|
||||||
homepage = "https://git.mtgmonkey.net/Andromeda/hs-rgfw";
|
homepage = "https://git.mtgmonkey.net/Andromeda/hs-rgfw";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
platforms = ["x86_64-linux"];
|
platforms = ["x86_64-linux"];
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ name: hs-rgfw
|
|||||||
-- PVP summary: +-+------- breaking API changes
|
-- PVP summary: +-+------- breaking API changes
|
||||||
-- | | +----- non-breaking API additions
|
-- | | +----- non-breaking API additions
|
||||||
-- | | | +--- code changes with no API change
|
-- | | | +--- code changes with no API change
|
||||||
version: 0.1.0.0
|
version: 0.1.0.1
|
||||||
-- A short (one-line) description of the package.
|
-- A short (one-line) description of the package.
|
||||||
-- synopsis:
|
-- synopsis:
|
||||||
-- A longer description of the package.
|
-- A longer description of the package.
|
||||||
@@ -44,10 +44,6 @@ library
|
|||||||
base >=4.18
|
base >=4.18
|
||||||
pkgconfig-depends:
|
pkgconfig-depends:
|
||||||
gl,
|
gl,
|
||||||
wayland-client,
|
|
||||||
wayland-egl,
|
|
||||||
wayland-cursor,
|
|
||||||
xkbcommon,
|
|
||||||
x11,
|
x11,
|
||||||
xcursor,
|
xcursor,
|
||||||
xrandr,
|
xrandr,
|
||||||
|
|||||||
@@ -5,12 +5,10 @@
|
|||||||
|
|
||||||
#define RGFW_IMPLEMENTATION
|
#define RGFW_IMPLEMENTATION
|
||||||
#define RGFW_DEBUG
|
#define RGFW_DEBUG
|
||||||
#define RGFW_X11
|
|
||||||
#define RGFW_WAYLAND
|
|
||||||
#define RGFW_OPENGL
|
#define RGFW_OPENGL
|
||||||
|
|
||||||
#define Time X11Time // fixes namespace clash with GHC when building with Nix
|
#define Time X11Time // fixes namespace clash with GHC when building with Nix
|
||||||
#include "RGFW.h"
|
#include "RGFW.h"
|
||||||
#undef Time
|
#undef Time
|
||||||
|
|
||||||
#endif RGFW_HS
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user