pyrox.dev / nixpkgs
lol
fork atom

slimevr: 0.16.0 -> 0.16.2 (#434907)

authored by Peder Bergebakken Sundt and committed by GitHub 3818beef 4936d6c8

+15 -28
unified split
+5 -11
pkgs/by-name/sl/slimevr-server/deps.json
··· 27 } 28 }, 29 "https://oss.sonatype.org/content/repositories/snapshots": { 30 - "com/fazecast#jSerialComm/2.11.1-20240515.234541-3/SNAPSHOT": { 31 - "jar": "sha256-n4A3U5elHQhq9b0YVgvWCuXAHqt0RzxL5e4Fe4iGTkM=", 32 - "module": "sha256-xeVUO5f2Imx43EgYUI5vbLXyyEmJh/jT106eLUWtUYg=", 33 - "pom": "sha256-y+ZXr7k89vlAHOMZmlTNYl8D0Nki+6CDame/QNX/e2M=" 34 - }, 35 - "com/fazecast/jSerialComm/2.11.1-SNAPSHOT/maven-metadata": { 36 - "xml": { 37 - "groupId": "com.fazecast", 38 - "lastUpdated": "20241221185706" 39 - } 40 - }, 41 "net/java/dev/jna#jna-platform/5.1.1-20181118.214522-1/SNAPSHOT": { 42 "pom": "sha256-STVISbMwC8BymYDxq6UJhC3ZWqO+p7iA7lRW34ZcX6g=" 43 }, ··· 559 }, 560 "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": { 561 "pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU=" 562 }, 563 "com/github/jonpeterson#jackson-module-model-versioning/1.2.2": { 564 "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=",
··· 27 } 28 }, 29 "https://oss.sonatype.org/content/repositories/snapshots": { 30 "net/java/dev/jna#jna-platform/5.1.1-20181118.214522-1/SNAPSHOT": { 31 "pom": "sha256-STVISbMwC8BymYDxq6UJhC3ZWqO+p7iA7lRW34ZcX6g=" 32 }, ··· 548 }, 549 "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": { 550 "pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU=" 551 + }, 552 + "com/fazecast#jSerialComm/2.11.2": { 553 + "jar": "sha256-IG2ScOZI3wMyR+deuECTpek9ePB8U+X+H6n8SmAaxXY=", 554 + "module": "sha256-9ogHv84GSzOaAwFlbzbffC8GORkp7GKOyGyOMK7bufw=", 555 + "pom": "sha256-jc/TZu3kSH1ZOSy+OvUaN3cUT09dRPinstTcvwBB38I=" 556 }, 557 "com/github/jonpeterson#jackson-module-model-versioning/1.2.2": { 558 "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=",
+10 -17
pkgs/by-name/sl/slimevr/package.nix
··· 1 { 2 lib, 3 fetchFromGitHub, 4 - fetchpatch, 5 stdenv, 6 replaceVars, 7 makeWrapper, ··· 17 webkitgtk_4_1, 18 gst_all_1, 19 libayatana-appindicator, 20 }: 21 22 rustPlatform.buildRustPackage rec { 23 pname = "slimevr"; 24 - version = "0.16.0"; 25 26 src = fetchFromGitHub { 27 owner = "SlimeVR"; 28 repo = "SlimeVR-Server"; 29 - rev = "v${version}"; 30 - hash = "sha256-ZYL+aBrADbzSXnhFzxNk8xRrY0WHmHCtVaC6VfXfLJw="; 31 # solarxr 32 fetchSubmodules = true; 33 }; 34 35 buildAndTestSubdir = "gui/src-tauri"; 36 37 - cargoHash = "sha256-+WrBVL4/XslJSOwuxs4IzqXG9l1/lMSbKil/8OHc9Xw="; 38 39 pnpmDeps = pnpm_9.fetchDeps { 40 pname = "${pname}-pnpm-deps"; 41 inherit version src; 42 fetcherVersion = 1; 43 - hash = "sha256-lh5IKdBXuH9GZFUTrzaQFDWCEYj0UJhKwCdPmsiwfCs="; 44 }; 45 46 nativeBuildInputs = [ ··· 50 pkg-config 51 wrapGAppsHook3 52 makeWrapper 53 ]; 54 55 buildInputs = [ ··· 85 --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" 86 substituteInPlace gui/src-tauri/src/tray.rs \ 87 --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" 88 - 89 - # tao < version 0.31 has a GTK crash. Manually apply the fix. 90 - pushd $cargoDepsCopy/tao-0.30.* 91 - patch -p1 < ${ 92 - fetchpatch { 93 - name = "fix-gtk-crash.patch"; 94 - url = "https://github.com/tauri-apps/tao/commit/83e35e961f4893790b913ee2efc15ae33fd16fb2.diff"; 95 - hash = "sha256-FNXWzsg4lO6VbLsqS6NevX8kVj26YtcYdKbbFejq9hM="; 96 - } 97 - } 98 - popd 99 ''; 100 101 # solarxr needs to be installed after compiling its Typescript files. This isn't ··· 105 ''; 106 107 doCheck = false; # No tests 108 109 # Get rid of placeholder slimevr.jar 110 postInstall = '' 111 rm $out/share/slimevr/slimevr.jar 112 rm -d $out/share/slimevr 113 ''; 114 115 # `JAVA_HOME`, `JAVA_TOOL_OPTIONS`, and `--launch-from-path` are so the GUI can
··· 1 { 2 lib, 3 fetchFromGitHub, 4 stdenv, 5 replaceVars, 6 makeWrapper, ··· 16 webkitgtk_4_1, 17 gst_all_1, 18 libayatana-appindicator, 19 + udevCheckHook, 20 }: 21 22 rustPlatform.buildRustPackage rec { 23 pname = "slimevr"; 24 + version = "0.16.2"; 25 26 src = fetchFromGitHub { 27 owner = "SlimeVR"; 28 repo = "SlimeVR-Server"; 29 + tag = "v${version}"; 30 + hash = "sha256-g0SDienJX7ZUbypeIAWSwjxgu40AFd3jVALuMhHj6mQ="; 31 # solarxr 32 fetchSubmodules = true; 33 }; 34 35 buildAndTestSubdir = "gui/src-tauri"; 36 37 + cargoHash = "sha256-w2z+EQqkVGLmXQS+AzeJwkGG4ovpz9+ovmLOcUks734="; 38 39 pnpmDeps = pnpm_9.fetchDeps { 40 pname = "${pname}-pnpm-deps"; 41 inherit version src; 42 fetcherVersion = 1; 43 + hash = "sha256-b0oCOjxrUQqWmUR6IzTEO75pvJZB7MQD14DNbQm95sA="; 44 }; 45 46 nativeBuildInputs = [ ··· 50 pkg-config 51 wrapGAppsHook3 52 makeWrapper 53 + udevCheckHook 54 ]; 55 56 buildInputs = [ ··· 86 --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" 87 substituteInPlace gui/src-tauri/src/tray.rs \ 88 --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" 89 ''; 90 91 # solarxr needs to be installed after compiling its Typescript files. This isn't ··· 95 ''; 96 97 doCheck = false; # No tests 98 + doInstallCheck = true; # Check udev 99 100 # Get rid of placeholder slimevr.jar 101 postInstall = '' 102 rm $out/share/slimevr/slimevr.jar 103 rm -d $out/share/slimevr 104 + 105 + install -Dm644 -t $out/lib/udev/rules.d/ gui/src-tauri/69-slimevr-devices.rules 106 ''; 107 108 # `JAVA_HOME`, `JAVA_TOOL_OPTIONS`, and `--launch-from-path` are so the GUI can