diff options
| author | EuAndreh <eu@euandre.org> | 2020-12-26 08:39:27 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2020-12-26 08:39:27 -0300 |
| commit | 6f3dcd063e864b6c5686f6dba7daa48af61a59a9 (patch) | |
| tree | 590f1f7474a5e8cd13a933faaa3aa6f2567bf6b3 | |
| parent | default.nix: Use --trace in jekyll build (diff) | |
| download | euandre.org-6f3dcd063e864b6c5686f6dba7daa48af61a59a9.tar.gz euandre.org-6f3dcd063e864b6c5686f6dba7daa48af61a59a9.tar.xz | |
default.nix: inherit buildInputs on derivations
Diffstat (limited to '')
| -rw-r--r-- | default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/default.nix b/default.nix index c25fdbc..8d29ca6 100644 --- a/default.nix +++ b/default.nix @@ -21,7 +21,7 @@ let }; }); - projectBuildInputs = with pkgs; [ + buildInputs = with pkgs; [ jekyllEnv pkgs-next.mdpo mktorrent-newer @@ -38,20 +38,18 @@ let ]; in rec { site = pkgs.stdenv.mkDerivation { - inherit src; + inherit src buildInputs; name = "website-site"; phases = [ "unpackPhase" "buildPhase" ]; - buildInputs = projectBuildInputs; buildPhase = '' patchShebangs . jekyll build -d $out --trace ''; }; test = pkgs.stdenv.mkDerivation { - inherit src; + inherit src buildInputs; name = "website-test"; phases = [ "unpackPhase" "buildPhase" ]; - buildInputs = projectBuildInputs; buildPhase = '' patchShebangs . ./tests.sh @@ -59,8 +57,8 @@ in rec { ''; }; shell = pkgs.mkShell { + inherit buildInputs; name = "website-shell"; - buildInputs = projectBuildInputs; shellHook = '' echo 'Starting a live server with:' echo ' jekyll serve --future --livereload --trace' |