opdavies/presentations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor

Browse source
This commit is contained in:
Oliver Davies 2025-04-15 23:57:55 +01:00
parent e24d2df83f
commit a4415a9c90
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.nix
View file

@ -8,7 +8,6 @@
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (nixpkgs.lib) makeOverridable;
inherit (pkgs.stdenvNoCC) mkDerivation; inherit (pkgs.stdenvNoCC) mkDerivation;
interStaticFonts = mkDerivation { interStaticFonts = mkDerivation {
@ -27,11 +26,6 @@
''; '';
}; };
fontPaths = lib.concatStringsSep ":" [
"${pkgs.inconsolata}/share/fonts/truetype/inconsolata"
"${interStaticFonts}/share/fonts/truetype"
];
shared-assets = mkDerivation { shared-assets = mkDerivation {
name = "talks-shared-assets"; name = "talks-shared-assets";
src = ./src; src = ./src;
@ -51,8 +45,14 @@
(python310.withPackages (p: with p; [ rst2pdf ])) (python310.withPackages (p: with p; [ rst2pdf ]))
]; ];
mkTalk = makeOverridable ( mkTalk = lib.makeOverridable (
{ name, src }: { name, src }:
let
fontPaths = lib.concatStringsSep ":" [
"${pkgs.inconsolata}/share/fonts/truetype/inconsolata"
"${interStaticFonts}/share/fonts/truetype"
];
in
mkDerivation { mkDerivation {
inherit name shared-assets src; inherit name shared-assets src;
@ -82,7 +82,7 @@
runHook preBuild runHook preBuild
mkdir $out mkdir $out
cp slides.pdf $out cp *.pdf $out
runHook postBuild runHook postBuild
''; '';