diff --git a/patches/04-crabfit-karla.patch b/patches/04-crabfit-karla.patch new file mode 100644 index 0000000..366928a --- /dev/null +++ b/patches/04-crabfit-karla.patch @@ -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 + ''; diff --git a/patches/default.nix b/patches/default.nix index 637d43c..691cc88 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -20,6 +20,19 @@ in id = "275165"; 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" = [ # netbox module