Skip to content

Commit 7a2649a

Browse files
committed
make old jekyll available for sbt
1 parent f61ed6c commit 7a2649a

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

flake.lock

Lines changed: 18 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,25 @@
33

44
inputs = {
55
nixpkgs.url = "nixpkgs/nixos-unstable";
6+
nixpkgs-jekyll.url = github:NixOS/nixpkgs?rev=9a9dae8f6319600fa9aebde37f340975cab4b8c0;
67
flake-utils.url = github:numtide/flake-utils;
78
};
89

9-
outputs = { nixpkgs, flake-utils, ... }:
10+
outputs = { nixpkgs, nixpkgs-jekyll, flake-utils, ... }:
1011
flake-utils.lib.eachDefaultSystem (system:
1112
let
1213
scalaOverlay = self: super: {
14+
# jekyll v4.3.1 is needed for sbt-microsite
15+
inherit (nixpkgs-jekyll.legacyPackages.${system}) jekyll;
1316
jre = super.jdk21_headless;
1417
sbt = super.sbt.overrideAttrs (
1518
old: {
1619
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ super.makeWrapper ];
1720
# Setting SBT_OPTS because of this bug: https://github.com/sbt/sbt-site/issues/169
1821
postInstall = ''
19-
wrapProgram $out/bin/sbt --suffix SBT_OPTS : '--add-opens java.base/java.lang=ALL-UNNAMED'
22+
wrapProgram $out/bin/sbt \
23+
--suffix SBT_OPTS : '--add-opens java.base/java.lang=ALL-UNNAMED' \
24+
--prefix PATH : ${super.lib.makeBinPath [ self.jekyll ]}
2025
'';
2126
}
2227
);

0 commit comments

Comments
 (0)