diff --git a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch b/pkgs/by-name/al/alcom/disable-updater-artifacts.patch deleted file mode 100644 index 17e739d312c6..000000000000 --- a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vrc-get-gui/Tauri.toml b/vrc-get-gui/Tauri.toml -index cd180da8..66a81aa9 100644 ---- a/vrc-get-gui/Tauri.toml -+++ b/vrc-get-gui/Tauri.toml -@@ -34,8 +34,6 @@ icon = [ - resources = [] - publisher = "anatawa12" - --createUpdaterArtifacts = "v1Compatible" # remove if ci # we do not generate updater artifacts in CI -- - [[bundle.fileAssociations]] - # note: for macOS we directory use info.plist for registering file association. - description = "ALCOM Project Template" diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index fb58e6d60d59..eccbad84748d 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -17,25 +17,18 @@ webkitgtk_4_1, }: let + subdir = "vrc-get-gui"; +in +rustPlatform.buildRustPackage (finalAttrs: { pname = "alcom"; - version = "1.1.5"; - + version = "1.1.6"; src = fetchFromGitHub { owner = "vrc-get"; repo = "vrc-get"; - tag = "gui-v${version}"; - hash = "sha256-xucU8nXskniHOiuwrtVoZM2FIKNKU45i4DNo6iLjZvM="; + tag = "gui-v${finalAttrs.version}"; + hash = "sha256-TpVHE3e3dMdBOtPVKomKvg5tQf42QWik18k5oVD2Hms="; }; - subdir = "vrc-get-gui"; -in -rustPlatform.buildRustPackage { - inherit pname version src; - - patches = [ - ./disable-updater-artifacts.patch - ]; - nativeBuildInputs = [ cargo-about cargo-tauri.hook @@ -55,13 +48,15 @@ rustPlatform.buildRustPackage { webkitgtk_4_1 ]; - cargoHash = "sha256-MeCx3BoEXckMZfecyBcwwVE8+6V9Di6ULkIhUvUFZIA="; + cargoHash = "sha256-J8vCr+B4J3ZqxkkNk+x0jr52qNJJYfBJe2oyLf0GLsc="; + buildFeatures = [ "no-self-updater" ]; buildAndTestSubdir = subdir; npmDeps = fetchNpmDeps { - inherit src; - sourceRoot = "${src.name}/${subdir}"; - hash = "sha256-snXOfAtanLPhQNo0mg/r8UUXJua2X+52t7+7QS1vOkI="; + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/${subdir}"; + hash = "sha256-VyA2c2659Kg1DjLmmtvSAivltdraSBNArIu1XGENGmQ="; }; npmRoot = subdir; @@ -69,8 +64,11 @@ rustPlatform.buildRustPackage { description = "Experimental GUI application to manage VRChat Unity Projects"; homepage = "https://github.com/vrc-get/vrc-get"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Scrumplex ]; + maintainers = with lib.maintainers; [ + Scrumplex + ImSapphire + ]; broken = stdenv.hostPlatform.isDarwin; mainProgram = "ALCOM"; }; -} +})