From b98f7cb52c21c68d5ed6bf90e617ad7edce610b4 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Wed, 25 Jan 2023 19:28:00 +0100 Subject: [PATCH] fix: Fix missing dependencies in the build --- flake.nix | 9 ++++++--- pkgs/website.nix | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 5029080..32655c8 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,9 @@ inherit system; }; + jekyllPackages = with pkgs; [ + rubyPackages.jekyll-feed rubyPackages.jekyll-seo-tag + ]; tailwindWithTypography = (pkgs.nodePackages.tailwindcss.overrideAttrs (old: { plugins = [ pkgs.nodePackages."@tailwindcss/typography" @@ -20,14 +23,14 @@ devShell = pkgs.mkShell { buildInputs = with pkgs; [ tailwindWithTypography - jekyll rubyPackages.jekyll-feed rubyPackages.jekyll-seo-tag + jekyll imagemagick - ]; + ] ++ jekyllPackages; }; packages = { website = pkgs.callPackage ./pkgs/website.nix { - inherit tailwindWithTypography; + inherit tailwindWithTypography jekyllPackages; }; }; }); diff --git a/pkgs/website.nix b/pkgs/website.nix index d10138b..eb112ed 100644 --- a/pkgs/website.nix +++ b/pkgs/website.nix @@ -1,5 +1,5 @@ { - jekyll, tailwindWithTypography + jekyll, jekyllPackages, tailwindWithTypography , stdenv }: @@ -8,6 +8,10 @@ stdenv.mkDerivation { version = "0.1.0"; src = ./../.; + buildInputs = [ + jekyll jekyllPackages tailwindWithTypography + ]; + buildPhase = '' ${jekyll}/bin/jekyll build --future cp -r ./assets _site/assets