diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/default.nix | 18 | ||||
| -rw-r--r-- | Documentation/jekyll.nix | 5 |
2 files changed, 10 insertions, 13 deletions
diff --git a/Documentation/default.nix b/Documentation/default.nix index f2f9aa4..94d4741 100644 --- a/Documentation/default.nix +++ b/Documentation/default.nix @@ -1,10 +1,10 @@ -# SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is> +# SPDX-FileCopyrightText: 2022-2023 Alyssa Ross <hi@alyssa.is> # SPDX-FileCopyrightText: 2022 Unikie # SPDX-License-Identifier: MIT -import ../lib/eval-config.nix ({ config, src, ... }: config.pkgs.callPackage ( +import ../lib/call-package.nix -{ stdenvNoCC, jekyll, drawio-headless }: +({ callSpectrumPackage, src, stdenvNoCC, jekyll, drawio-headless }: stdenvNoCC.mkDerivation { name = "spectrum-docs"; @@ -20,10 +20,8 @@ stdenvNoCC.mkDerivation { dontInstall = true; - nativeBuildInputs = [ jekyll drawio-headless ]; - - passthru = { inherit jekyll; }; -} -) { - jekyll = import ./jekyll.nix { inherit config; }; -}) + nativeBuildInputs = [ + (callSpectrumPackage ./jekyll.nix {}) + drawio-headless + ]; +}) (_: {}) diff --git a/Documentation/jekyll.nix b/Documentation/jekyll.nix index 4b32ebe..8956683 100644 --- a/Documentation/jekyll.nix +++ b/Documentation/jekyll.nix @@ -1,8 +1,7 @@ # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is> # SPDX-License-Identifier: MIT -import ../lib/eval-config.nix ({ config, ... }: config.pkgs.callPackage ( - +import ../lib/call-package.nix ( { bundlerApp }: bundlerApp { @@ -10,4 +9,4 @@ bundlerApp { gemdir = ./.; exes = [ "jekyll" ]; } -) { }) +) (_: {}) |