fix(crabfit): Don't depend on all of google-fonts
All checks were successful
build configuration / build_web02 (push) Successful in 2m10s
build configuration / build_rescue01 (push) Successful in 2m13s
build configuration / build_compute01 (push) Successful in 2m19s
build configuration / build_vault01 (push) Successful in 2m20s
lint / check (push) Successful in 26s
build configuration / build_storage01 (push) Successful in 2m42s
build configuration / build_web01 (push) Successful in 2m48s
build configuration / push_to_cache (push) Successful in 4m11s
All checks were successful
build configuration / build_web02 (push) Successful in 2m10s
build configuration / build_rescue01 (push) Successful in 2m13s
build configuration / build_compute01 (push) Successful in 2m19s
build configuration / build_vault01 (push) Successful in 2m20s
lint / check (push) Successful in 26s
build configuration / build_storage01 (push) Successful in 2m42s
build configuration / build_web01 (push) Successful in 2m48s
build configuration / push_to_cache (push) Successful in 4m11s
This commit is contained in:
parent
be128f6c3a
commit
fca52e471e
2 changed files with 37 additions and 0 deletions
24
patches/04-crabfit-karla.patch
Normal file
24
patches/04-crabfit-karla.patch
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
diff --git a/pkgs/by-name/cr/crabfit-frontend/package.nix b/pkgs/by-name/cr/crabfit-frontend/package.nix
|
||||||
|
index 99d7be0fdeae..9f858e8a9a9e 100644
|
||||||
|
--- a/pkgs/by-name/cr/crabfit-frontend/package.nix
|
||||||
|
+++ b/pkgs/by-name/cr/crabfit-frontend/package.nix
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
nodejs,
|
||||||
|
yarn,
|
||||||
|
fixup_yarn_lock,
|
||||||
|
- google-fonts,
|
||||||
|
+ karla,
|
||||||
|
api_url ? "http://127.0.0.1:3000",
|
||||||
|
frontend_url ? "crab.fit",
|
||||||
|
}:
|
||||||
|
@@ -83,9 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
patchShebangs node_modules
|
||||||
|
|
||||||
|
mkdir -p src/app/fonts
|
||||||
|
- cp "${
|
||||||
|
- google-fonts.override { fonts = [ "Karla" ]; }
|
||||||
|
- }/share/fonts/truetype/Karla[wght].ttf" src/app/fonts/karla.ttf
|
||||||
|
+ cp "${karla}/share/fonts/truetype/Karla-Regular.ttf" src/app/fonts/karla.ttf
|
||||||
|
|
||||||
|
runHook postConfigure
|
||||||
|
'';
|
|
@ -20,6 +20,19 @@ in
|
||||||
id = "275165";
|
id = "275165";
|
||||||
hash = "sha256-9a26V3Pi8yLD3N9+mC1kvJoruxRTp/qOHapnt6VX7pw=";
|
hash = "sha256-9a26V3Pi8yLD3N9+mC1kvJoruxRTp/qOHapnt6VX7pw=";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# karla: init at 2.004
|
||||||
|
{
|
||||||
|
_type = "commit";
|
||||||
|
sha = "7c51104112e8ea0e2ac53bf7d535e677f7686a9e";
|
||||||
|
hash = "sha256-1TBLzZkvkFhCL8RYVVIUhTyrH3+X1iJIMkyHffmrOWc=";
|
||||||
|
}
|
||||||
|
|
||||||
|
# Crabfit: don't depend on all google-fonts
|
||||||
|
{
|
||||||
|
_type = "static";
|
||||||
|
path = ./04-crabfit-karla.patch;
|
||||||
|
}
|
||||||
];
|
];
|
||||||
"nixos-23.11" = [
|
"nixos-23.11" = [
|
||||||
# netbox module
|
# netbox module
|
||||||
|
|
Loading…
Reference in a new issue