diff --git a/pkgs/by-name/ro/roomarranger/package.nix b/pkgs/by-name/ro/roomarranger/package.nix index c5343115baf4..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.2"; + inherit version; src = fetchurl { - url = "https://f000.backblazeb2.com/file/rooarr/rooarr1020-linux64.tar.gz"; - hash = "sha256-24AGP2le5HfcVMlqDjiMRcRWKU/zjACV7KzJlVWMpkw="; + 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 = [ @@ -44,7 +46,6 @@ stdenv.mkDerivation { buildInputs = [ gtk3 qt6.qt3d - qt6.qtwayland ]; installPhase = '' @@ -53,6 +54,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 +80,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";