From 2d25de6f85616a869c04ee893132395a63f310f1 Mon Sep 17 00:00:00 2001
From: Nico Bellack <nico@bellack.dev>
Date: Tue, 18 Nov 2025 21:06:03 +0100
Subject: [PATCH 1/2] roomarranger: 10.2 -> 10.3

---
 pkgs/by-name/ro/roomarranger/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ro/roomarranger/package.nix b/pkgs/by-name/ro/roomarranger/package.nix
index c5343115baf4..cd033ba01ef6 100644
--- a/pkgs/by-name/ro/roomarranger/package.nix
+++ b/pkgs/by-name/ro/roomarranger/package.nix
@@ -28,11 +28,11 @@ in
 
 stdenv.mkDerivation {
   pname = "roomarranger";
-  version = "10.2";
+  version = "10.3";
 
   src = fetchurl {
-    url = "https://f000.backblazeb2.com/file/rooarr/rooarr1020-linux64.tar.gz";
-    hash = "sha256-24AGP2le5HfcVMlqDjiMRcRWKU/zjACV7KzJlVWMpkw=";
+    url = "https://f000.backblazeb2.com/file/rooarr/rooarr1030-linux64.tar.gz";
+    hash = "sha256-v9PdWPR9x0lUmqIuTgwBZuyPy/vJLB5XM4eb5y0/SN8=";
   };
 
   nativeBuildInputs = [
@@ -44,7 +44,6 @@ stdenv.mkDerivation {
   buildInputs = [
     gtk3
     qt6.qt3d
-    qt6.qtwayland
   ];
 
   installPhase = ''
@@ -53,6 +52,10 @@ stdenv.mkDerivation {
     mkdir -p $out/lib $out/bin
     cp -r rooarr-bin/* $out/lib/
 
+    # Remove Wayland plugins that require unavailable libraries
+    rm -rf $out/lib/wayland-graphics-integration-client
+    rm -f $out/lib/platforms/libqwayland-*.so
+
     ln -s $out/lib/RoomArranger $out/bin/roomarranger
 
     # Install application icons
@@ -75,6 +78,8 @@ stdenv.mkDerivation {
     longDescription = ''
       Room Arranger is a 3D room / apartment / floor planner with a simple user interface.
       Free for 30 days. Updates are free.
+
+      Note: This package uses XCB (X11) for rendering. On Wayland compositors, it will run via XWayland.
     '';
     homepage = "https://www.roomarranger.com/";
     changelog = "https://www.roomarranger.com/whatsnew.txt";

From c5ead102a59f7250fe8afda9f881d51951e2bc1a Mon Sep 17 00:00:00 2001
From: Nico Bellack <nico@bellack.dev>
Date: Wed, 19 Nov 2025 21:15:36 +0100
Subject: [PATCH 2/2] roomarranger: 10.3 -> 10.3.1

---
 pkgs/by-name/ro/roomarranger/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roomarranger/package.nix b/pkgs/by-name/ro/roomarranger/package.nix
index cd033ba01ef6..f785bdacd41d 100644
--- a/pkgs/by-name/ro/roomarranger/package.nix
+++ b/pkgs/by-name/ro/roomarranger/package.nix
@@ -10,6 +10,8 @@
 }:
 
 let
+  version = "10.3.1";
+
   desktopItem = makeDesktopItem {
     type = "Application";
     exec = "roomarranger";
@@ -28,11 +30,11 @@ in
 
 stdenv.mkDerivation {
   pname = "roomarranger";
-  version = "10.3";
+  inherit version;
 
   src = fetchurl {
-    url = "https://f000.backblazeb2.com/file/rooarr/rooarr1030-linux64.tar.gz";
-    hash = "sha256-v9PdWPR9x0lUmqIuTgwBZuyPy/vJLB5XM4eb5y0/SN8=";
+    url = "https://f000.backblazeb2.com/file/rooarr/rooarr${lib.versions.major version}${lib.versions.minor version}${lib.versions.patch version}-linux64.tar.gz";
+    hash = "sha256-J4/IsOH12CutjorGtZzKbL4uFYWd9SXmjNx32Vi5dr0=";
   };
 
   nativeBuildInputs = [