mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
alcom: 1.8.2 -> 1.0.1
We were using the wrong tag as pointed out in https://github.com/NixOS/nixpkgs/pull/348118#issuecomment-2563921040 Co-authored-by: Geist <68447848+AT-Geist@users.noreply.github.com> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
parent
30a951f637
commit
c45cf07732
4 changed files with 38 additions and 6077 deletions
6008
pkgs/by-name/al/alcom/Cargo.lock
generated
6008
pkgs/by-name/al/alcom/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
13
pkgs/by-name/al/alcom/disable-updater-artifacts.patch
Normal file
13
pkgs/by-name/al/alcom/disable-updater-artifacts.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/vrc-get-gui/Tauri.toml b/vrc-get-gui/Tauri.toml
|
||||||
|
index ff969dbb..1339d861 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.linux.deb]
|
||||||
|
desktopTemplate = "alcom.desktop"
|
||||||
|
|
|
@ -1,43 +1,37 @@
|
||||||
{
|
{
|
||||||
buildDotnetModule,
|
buildDotnetModule,
|
||||||
cargo-about,
|
cargo-about,
|
||||||
cargo-tauri_1,
|
cargo-tauri,
|
||||||
dotnetCorePackages,
|
dotnetCorePackages,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
fetchNpmDeps,
|
fetchNpmDeps,
|
||||||
glib-networking,
|
glib-networking,
|
||||||
google-fonts,
|
|
||||||
lib,
|
lib,
|
||||||
libsoup_2_4,
|
libsoup_3,
|
||||||
|
makeBinaryWrapper,
|
||||||
nodejs,
|
nodejs,
|
||||||
npmHooks,
|
npmHooks,
|
||||||
openssl,
|
openssl,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
stdenv,
|
stdenv,
|
||||||
webkitgtk_4_0,
|
wrapGAppsHook4,
|
||||||
|
webkitgtk_4_1,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
pname = "alcom";
|
pname = "alcom";
|
||||||
version = "1.8.2";
|
version = "1.0.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vrc-get";
|
owner = "vrc-get";
|
||||||
repo = "vrc-get";
|
repo = "vrc-get";
|
||||||
tag = "v${version}";
|
tag = "gui-v${version}";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
hash = "sha256-jkhjJTb/U2dXj/vyaip+gWoqIOdfFKSExeDl0T11DE4=";
|
hash = "sha256-cOx7X3xfTBYpXhv1zIRStaIpyGWSp+d7qzdJLGzXtDY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
subdir = "vrc-get-gui";
|
subdir = "vrc-get-gui";
|
||||||
|
|
||||||
google-fonts' = google-fonts.override {
|
|
||||||
fonts = [
|
|
||||||
"NotoSans"
|
|
||||||
"NotoSansJP"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
dotnetSdk = dotnetCorePackages.sdk_8_0;
|
dotnetSdk = dotnetCorePackages.sdk_8_0;
|
||||||
dotnetRuntime = dotnetCorePackages.runtime_8_0;
|
dotnetRuntime = dotnetCorePackages.runtime_8_0;
|
||||||
|
|
||||||
|
@ -57,12 +51,17 @@ in
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./disable-updater-artifacts.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cargo-about
|
cargo-about
|
||||||
cargo-tauri_1.hook
|
cargo-tauri.hook
|
||||||
dotnetSdk
|
dotnetSdk
|
||||||
nodejs
|
nodejs
|
||||||
npmHooks.npmConfigHook
|
npmHooks.npmConfigHook
|
||||||
|
wrapGAppsHook4
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -70,44 +69,34 @@ rustPlatform.buildRustPackage {
|
||||||
[ openssl ]
|
[ openssl ]
|
||||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||||
glib-networking
|
glib-networking
|
||||||
libsoup_2_4
|
libsoup_3
|
||||||
webkitgtk_4_0
|
makeBinaryWrapper
|
||||||
|
webkitgtk_4_1
|
||||||
]
|
]
|
||||||
++ dotnetSdk.packages
|
++ dotnetSdk.packages
|
||||||
++ dotnetBuild.nugetDeps;
|
++ dotnetBuild.nugetDeps;
|
||||||
|
|
||||||
cargoLock = {
|
useFetchCargoVendor = true;
|
||||||
lockFile = ./Cargo.lock;
|
cargoHash = "sha256-Ph6QZW21JYQJgrUecN+MklWuY51iKC2glPEdgxw+3r8=";
|
||||||
outputHashes = {
|
|
||||||
"tauri-plugin-single-instance-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
buildAndTestSubdir = subdir;
|
buildAndTestSubdir = subdir;
|
||||||
|
|
||||||
npmDeps = fetchNpmDeps {
|
npmDeps = fetchNpmDeps {
|
||||||
inherit src;
|
inherit src;
|
||||||
sourceRoot = "${src.name}/${subdir}";
|
sourceRoot = "${src.name}/${subdir}";
|
||||||
hash = "sha256-4zokKLhLgW2u1GxeTlIAAxJINSpxHRtY5HXmhi9nj6c=";
|
hash = "sha256-lWQPBILZn8VGoILfEY2bMxGaBL2ALGbvcT5RqanTNyY=";
|
||||||
};
|
};
|
||||||
npmRoot = subdir;
|
npmRoot = subdir;
|
||||||
|
|
||||||
patches = [
|
|
||||||
./use-local-fonts.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
install -Dm644 "${google-fonts'}/share/fonts/truetype/NotoSans[wdth,wght].ttf" ${subdir}/app/fonts/noto-sans.ttf
|
|
||||||
install -Dm644 "${google-fonts'}/share/fonts/truetype/NotoSansJP[wght].ttf" ${subdir}/app/fonts/noto-sans-jp.ttf
|
|
||||||
'';
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
dotnet restore "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" \
|
dotnet restore "vrc-get-litedb/dotnet/vrc-get-litedb.csproj" \
|
||||||
-p:ContinuousIntegrationBuild=true \
|
-p:ContinuousIntegrationBuild=true \
|
||||||
-p:Deterministic=true
|
-p:Deterministic=true
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# NuGet.targets(156,5): error : Unable to load the service index for source https://api.nuget.org/v3/index.json.
|
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||||
NuGetAudit = "false";
|
wrapProgram $out/bin/ALCOM \
|
||||||
|
--set APPIMAGE ALCOM
|
||||||
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit (dotnetBuild) fetch-deps;
|
inherit (dotnetBuild) fetch-deps;
|
||||||
|
@ -118,8 +107,7 @@ rustPlatform.buildRustPackage {
|
||||||
homepage = "https://github.com/vrc-get/vrc-get";
|
homepage = "https://github.com/vrc-get/vrc-get";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with lib.maintainers; [ Scrumplex ];
|
maintainers = with lib.maintainers; [ Scrumplex ];
|
||||||
# aarch64-linux: Error failed to build app: Target aarch64-unknown-linux-gnu does not exist. Please run `rustup target list` to see the available targets.
|
broken = stdenv.hostPlatform.isDarwin;
|
||||||
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
|
|
||||||
mainProgram = "alcom";
|
mainProgram = "alcom";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
diff --git a/vrc-get-gui/app/fonts.ts b/vrc-get-gui/app/fonts.ts
|
|
||||||
index 855de943..3fd6a0b6 100644
|
|
||||||
--- a/vrc-get-gui/app/fonts.ts
|
|
||||||
+++ b/vrc-get-gui/app/fonts.ts
|
|
||||||
@@ -1,5 +1,3 @@
|
|
||||||
-import {Noto_Sans_Mono} from "next/font/google";
|
|
||||||
+import localFont from "next/font/local";
|
|
||||||
|
|
||||||
-export const notoSansMono = Noto_Sans_Mono({
|
|
||||||
- subsets: ["latin"]
|
|
||||||
-});
|
|
||||||
+export const notoSansMono = localFont({ src: './fonts/noto-sans.ttf' })
|
|
||||||
diff --git a/vrc-get-gui/app/layout.tsx b/vrc-get-gui/app/layout.tsx
|
|
||||||
index f38ab32d..723101b7 100644
|
|
||||||
--- a/vrc-get-gui/app/layout.tsx
|
|
||||||
+++ b/vrc-get-gui/app/layout.tsx
|
|
||||||
@@ -1,13 +1,11 @@
|
|
||||||
import type {Metadata} from "next";
|
|
||||||
-import {Noto_Sans_JP} from "next/font/google";
|
|
||||||
+import localFont from "next/font/local";
|
|
||||||
import "./globals.css";
|
|
||||||
import 'react-toastify/dist/ReactToastify.css';
|
|
||||||
import {SideBar} from "@/components/SideBar";
|
|
||||||
import {Providers} from "@/components/providers";
|
|
||||||
|
|
||||||
-const notoSansJP = Noto_Sans_JP({
|
|
||||||
- subsets: ["latin"],
|
|
||||||
-});
|
|
||||||
+const notoSansJP = localFont({ src: "./fonts/noto-sans-jp.ttf", });
|
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
|
||||||
title: "Create Next App",
|
|
Loading…
Add table
Add a link
Reference in a new issue