diff --git a/configuration.nix b/configuration.nix index 39e4d87..44ff164 100644 --- a/configuration.nix +++ b/configuration.nix @@ -152,10 +152,6 @@ nixpkgs.config.allowUnfree = true; - # url = "https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2425.diff"; - # hash = sha256-572a968fda55d9fabd22ab94f8bc1bbdadb4ac21fbe2bf927d05fbf00d9a0e42 - - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -172,13 +168,8 @@ zenity htop usbutils - - # lemonake.packages.${pkgs.system}.wayvr-dashboard-git - monado - - ]; diff --git a/vr-overlay.nix b/vr-overlay.nix index 1d9fa31..0d6bfe9 100644 --- a/vr-overlay.nix +++ b/vr-overlay.nix @@ -7,7 +7,7 @@ src = final.fetchFromGitHub { owner = "ImSapphire"; repo = "xrizer"; - rev = "b0fd6807b9c6ab7cd16339e478ac3c78881080c9"; + rev = "0660170c3fcff27035a44052ab593c5e96208341"; hash = "sha256-D9jLaxWNce8XHfYePyOF2HEmJuDMKhuty+VO0CP8I38="; }; cargoDeps = prev.rustPackages.rustPlatform.fetchCargoVendor { @@ -18,23 +18,11 @@ }); monado = prev.monado.overrideAttrs (oldAttrs: rec { - # src = final.fetchgit { - # url = "https://tangled.org/@matrixfurry.com/monado"; - # rev = "f689a3cf"; - # hash = "sha256-WBC+1+01U/2kvHYflqZczRW4rDAcOqsAPalGo8Yg3EI="; - # }; - # src = final.fetchFromGitLab { - # domain = "gitlab.freedesktop.org"; - # owner = "xantoz"; - # repo = "monado"; - # rev = "d1474046"; - # hash = "sha256-c53oZMC0v74T9vGA+Bg+O4Eqr8VJviaM6/wS0kMo+84="; - # }; src = final.fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "61d59ca7"; + rev = "2ebbca83e896e0802185277ce0a0a463db7a7892"; hash = "sha256-JjlKHXd1SD9M8OpgFERZCvAhM0eMxjME96YU38DlKNw="; }; patches = [];