Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions pkgs/by-name/sl/slimevr-server/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 10 additions & 17 deletions pkgs/by-name/sl/slimevr/package.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
lib,
fetchFromGitHub,
fetchpatch,
stdenv,
replaceVars,
makeWrapper,
Expand All @@ -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 = [
Expand All @@ -50,6 +50,7 @@ rustPlatform.buildRustPackage rec {
pkg-config
wrapGAppsHook3
makeWrapper
udevCheckHook
];

buildInputs = [
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading