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