Unverified Commit 7b80b371 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #266521 from Scrumplex/pkgs/monado/unstable-2023-11-09 

monado: unstable-2023-08-22 -> unstable-2023-11-09
parents df554740 8e78c0eb

pkgs/applications/graphics/monado/default.nix

+5 −8
Original line number Diff line number Diff line
@@ -48,16 +48,16 @@ 
, serviceSupport ? true

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation {

  pname = "monado";

  version = "unstable-2023-08-22";

  version = "unstable-2023-11-09";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    owner = "monado";

    repo = "monado";

    rev = "4cc68f07c0f3c2fee57b01dde28a02e314d3bee6";

    sha256 = "sha256-VibdOSA/b4RmwwwXrwhivuiukNK10YazYF/p+YnqRZ8=";

    rev = "e983eecd73b1b91d2dfb356e1bc054e9202b2a7f";

    hash = "sha256-a4ukfmJbDkhr7P3NMTfbuhXjyOta3WCc5gswX7KUAw0=";

  };



  nativeBuildInputs = [
@@ -135,16 +135,13 @@ stdenv.mkDerivation rec { 
  patches = [

    # We don't have $HOME/.steam when building

    ./force-enable-steamvr_lh.patch



    # A recent (as of August 2023) SteamVR Beta has upgraded a driver interface which is incompatible with Monado

    ./steamvr_lh-use-old-interface.patch

  ];



  meta = with lib; {

    description = "Open source XR runtime";

    homepage = "https://monado.freedesktop.org/";

    license = licenses.boost;

    maintainers = with maintainers; [ expipiplus1 prusnak ];

    maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ];

    platforms = platforms.linux;

    mainProgram = "monado-cli";

  };

pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp

index 24b69fd..5b3a5ca 100644

--- a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp

+++ b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp

@@ -138,7 +138,7 @@ Context::setup_hmd(const char *serial, vr::ITrackedDeviceServerDriver *driver)

 	vr::EVRInitError err = driver->Activate(0);

 	VERIFY(err == vr::VRInitError_None, std::to_string(err).c_str());

 

-	auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent(vr::IVRDisplayComponent_Version));

+	auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent("IVRDisplayComponent_003"));

 	VERIFY(display, "IVRDisplayComponent is null");

 #undef VERIFY