diff --git a/pkgs/by-name/sl/slimevr-server/deps.json b/pkgs/by-name/sl/slimevr-server/deps.json index 0a9f2605b5b95..4358958894bef 100644 --- a/pkgs/by-name/sl/slimevr-server/deps.json +++ b/pkgs/by-name/sl/slimevr-server/deps.json @@ -27,17 +27,6 @@ } }, "https://oss.sonatype.org/content/repositories/snapshots": { - "com/fazecast#jSerialComm/2.11.1-20240515.234541-3/SNAPSHOT": { - "jar": "sha256-n4A3U5elHQhq9b0YVgvWCuXAHqt0RzxL5e4Fe4iGTkM=", - "module": "sha256-xeVUO5f2Imx43EgYUI5vbLXyyEmJh/jT106eLUWtUYg=", - "pom": "sha256-y+ZXr7k89vlAHOMZmlTNYl8D0Nki+6CDame/QNX/e2M=" - }, - "com/fazecast/jSerialComm/2.11.1-SNAPSHOT/maven-metadata": { - "xml": { - "groupId": "com.fazecast", - "lastUpdated": "20241221185706" - } - }, "net/java/dev/jna#jna-platform/5.1.1-20181118.214522-1/SNAPSHOT": { "pom": "sha256-STVISbMwC8BymYDxq6UJhC3ZWqO+p7iA7lRW34ZcX6g=" }, @@ -560,6 +549,11 @@ "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": { "pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU=" }, + "com/fazecast#jSerialComm/2.11.2": { + "jar": "sha256-IG2ScOZI3wMyR+deuECTpek9ePB8U+X+H6n8SmAaxXY=", + "module": "sha256-9ogHv84GSzOaAwFlbzbffC8GORkp7GKOyGyOMK7bufw=", + "pom": "sha256-jc/TZu3kSH1ZOSy+OvUaN3cUT09dRPinstTcvwBB38I=" + }, "com/github/jonpeterson#jackson-module-model-versioning/1.2.2": { "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=", "pom": "sha256-eN9L1tMAM6b3JUkuBewt0shfbc7EYm6wWT6KpO9f0ic=" diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index 039e001de7ac9..6ff93fb9c0346 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, stdenv, replaceVars, makeWrapper, @@ -17,30 +16,31 @@ webkitgtk_4_1, gst_all_1, libayatana-appindicator, + udevCheckHook, }: rustPlatform.buildRustPackage rec { pname = "slimevr"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "SlimeVR"; repo = "SlimeVR-Server"; - rev = "v${version}"; - hash = "sha256-ZYL+aBrADbzSXnhFzxNk8xRrY0WHmHCtVaC6VfXfLJw="; + tag = "v${version}"; + hash = "sha256-g0SDienJX7ZUbypeIAWSwjxgu40AFd3jVALuMhHj6mQ="; # solarxr fetchSubmodules = true; }; buildAndTestSubdir = "gui/src-tauri"; - cargoHash = "sha256-+WrBVL4/XslJSOwuxs4IzqXG9l1/lMSbKil/8OHc9Xw="; + cargoHash = "sha256-w2z+EQqkVGLmXQS+AzeJwkGG4ovpz9+ovmLOcUks734="; pnpmDeps = pnpm_9.fetchDeps { pname = "${pname}-pnpm-deps"; inherit version src; fetcherVersion = 1; - hash = "sha256-lh5IKdBXuH9GZFUTrzaQFDWCEYj0UJhKwCdPmsiwfCs="; + hash = "sha256-b0oCOjxrUQqWmUR6IzTEO75pvJZB7MQD14DNbQm95sA="; }; nativeBuildInputs = [ @@ -50,6 +50,7 @@ rustPlatform.buildRustPackage rec { pkg-config wrapGAppsHook3 makeWrapper + udevCheckHook ]; buildInputs = [ @@ -85,17 +86,6 @@ rustPlatform.buildRustPackage rec { --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" substituteInPlace gui/src-tauri/src/tray.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - - # tao < version 0.31 has a GTK crash. Manually apply the fix. - pushd $cargoDepsCopy/tao-0.30.* - patch -p1 < ${ - fetchpatch { - name = "fix-gtk-crash.patch"; - url = "https://github.com/tauri-apps/tao/commit/83e35e961f4893790b913ee2efc15ae33fd16fb2.diff"; - hash = "sha256-FNXWzsg4lO6VbLsqS6NevX8kVj26YtcYdKbbFejq9hM="; - } - } - popd ''; # solarxr needs to be installed after compiling its Typescript files. This isn't @@ -105,11 +95,14 @@ rustPlatform.buildRustPackage rec { ''; doCheck = false; # No tests + doInstallCheck = true; # Check udev # Get rid of placeholder slimevr.jar postInstall = '' rm $out/share/slimevr/slimevr.jar rm -d $out/share/slimevr + + install -Dm644 -t $out/lib/udev/rules.d/ gui/src-tauri/69-slimevr-devices.rules ''; # `JAVA_HOME`, `JAVA_TOOL_OPTIONS`, and `--launch-from-path` are so the GUI can