From 991df1e96a49faf4d071b05559a8c55098c02ec7 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Wed, 17 Sep 2025 15:48:47 -0500 Subject: [PATCH] vrcx: make overridable --- pkgs/by-name/vr/vrcx/package.nix | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix index c6f81c42fc2e..20cd2f40a8ff 100644 --- a/pkgs/by-name/vr/vrcx/package.nix +++ b/pkgs/by-name/vr/vrcx/package.nix @@ -11,10 +11,12 @@ stdenv, }: let - pname = "vrcx"; - version = "2025.09.10"; dotnet = dotnetCorePackages.dotnet_9; electron = electron_37; +in +buildNpmPackage (finalAttrs: { + pname = "vrcx"; + version = "2025.09.10"; src = fetchFromGitHub { owner = "vrcx-team"; @@ -23,29 +25,6 @@ let hash = "sha256-7axYnsImG+VllQE1rhr8NmuMCm5t3bgNYGIIn9j2wMk="; }; - backend = buildDotnetModule { - inherit version src; - pname = "${pname}-backend"; - - dotnet-sdk = dotnet.sdk; - dotnet-runtime = dotnet.runtime; - projectFile = "Dotnet/VRCX-Electron.csproj"; - - nugetDeps = ./deps.json; - - installPhase = '' - runHook preInstall - - mkdir -p $out/build/Electron - cp -r build/Electron/* $out/build/Electron/ - - runHook postInstall - ''; - }; -in -buildNpmPackage { - inherit pname version src; - npmDepsHash = "sha256-VFYWXPhZrg3q2PW4kWfVr5/DY8W6Uf1mvnwfB4mVBrs="; npmFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; @@ -76,7 +55,7 @@ buildNpmPackage { mkdir -p "$out/share/vrcx" cp -r build/*-unpacked/resources "$out/share/vrcx/" mkdir -p "$out/share/vrcx/resources/app.asar.unpacked/build/Electron" - cp -r ${backend}/build/Electron/* "$out/share/vrcx/resources/app.asar.unpacked/build/Electron/" + cp -r ${finalAttrs.passthru.backend}/build/Electron/* "$out/share/vrcx/resources/app.asar.unpacked/build/Electron/" makeWrapper '${electron}/bin/electron' "$out/bin/vrcx" \ --add-flags "--ozone-platform-hint=auto" \ @@ -107,7 +86,25 @@ buildNpmPackage { ]; passthru = { - inherit backend; + backend = buildDotnetModule { + pname = "${finalAttrs.pname}-backend"; + inherit (finalAttrs) version src; + + dotnet-sdk = dotnet.sdk; + dotnet-runtime = dotnet.runtime; + projectFile = "Dotnet/VRCX-Electron.csproj"; + + nugetDeps = ./deps.json; + + installPhase = '' + runHook preInstall + + mkdir -p $out/build/Electron + cp -r build/Electron/* $out/build/Electron/ + + runHook postInstall + ''; + }; }; meta = { @@ -126,4 +123,4 @@ buildNpmPackage { platforms = lib.platforms.linux; broken = !stdenv.hostPlatform.isx86_64; }; -} +})