Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slimmer nix runtime closure #3734

Merged
merged 7 commits into from
Oct 20, 2023
Merged

Slimmer nix runtime closure #3734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c05b9ac
Replaced jdk with jre as a runtime dependency and removed llvm-backen…
goodlyrottenapple Oct 20, 2023
9d8ca8e
minimised size of jre on linux
goodlyrottenapple Oct 20, 2023
681d06c
fix jre on mac
goodlyrottenapple Oct 20, 2023
e648db8
add missing modules to jre
goodlyrottenapple Oct 20, 2023
cded82d
select same version of clang as runtime dependency as the one used by…
goodlyrottenapple Oct 20, 2023
ee93a21
copy cmake folder to avoid depending on the whole llvm-backend repo a…
goodlyrottenapple Oct 20, 2023
3f53397
Merge branch 'develop' into sam/slimmer-nix
goodlyrottenapple Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
k-framework = { haskell-backend-bins, llvm-kompile-libs }:
prev.callPackage ./nix/k.nix {
inherit (prev) llvm-backend;
clang = prev."clang_${toString final.llvm-version}";
booster = booster-backend.packages.${prev.system}.kore-rpc-booster;
mavenix = { inherit (prev) buildMaven; };
haskell-backend = haskell-backend-bins;
Expand Down
16 changes: 10 additions & 6 deletions nix/k.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ src, clang, stdenv, lib, mavenix, runCommand, makeWrapper, bison, flex, gcc
, git, gmp, jdk, mpfr, ncurses, pkgconfig, python3, z3, haskell-backend, booster ? null
, prelude-kore, llvm-backend, llvm-backend-matching, debugger, version, llvm-kompile-libs }:
, git, gmp, jdk, jre_minimal, mpfr, ncurses, pkgconfig, python3, z3
, haskell-backend, booster ? null, prelude-kore, llvm-backend, debugger, version
, llvm-kompile-libs }:

let
unwrapped = mavenix.buildMaven {
Expand Down Expand Up @@ -46,13 +47,14 @@ let
fi
done

mkdir -p $out/lib/cmake/kframework && ln -sf ${llvm-backend.src}/cmake/* $out/lib/cmake/kframework/
mkdir -p $out/lib/cmake/kframework && cp ${llvm-backend.src}/cmake/* $out/lib/cmake/kframework/
ln -sf ${llvm-backend}/include/kllvm $out/include/
ln -sf ${llvm-backend}/include/kllvm-c $out/include/
ln -sf ${llvm-backend}/lib/kllvm $out/lib/
ln -sf ${llvm-backend}/lib/scripts $out/lib/
ln -sf ${llvm-backend}/bin/* $out/bin/
${lib.optionalString (booster != null ) "ln -sf ${booster}/bin/* $out/bin/"}
${lib.optionalString (booster != null)
"ln -sf ${booster}/bin/* $out/bin/"}

prelude_kore="$out/include/kframework/kore/prelude.kore"
mkdir -p "$(dirname "$prelude_kore")"
Expand All @@ -75,7 +77,10 @@ in let
flex
(if stdenv.isDarwin then clang else gcc)
gmp
jdk
(jre_minimal.override {
modules = [ "java.base" "java.desktop" "java.logging" "java.rmi" ];
jdk = if stdenv.isDarwin then jdk else jdk.override { headless = true; };
})
mpfr
ncurses
pkgconfig
Expand Down Expand Up @@ -123,6 +128,5 @@ in let
ln -sf ${haskell-backend}/bin/kore-parser $out/bin/kore-parser
ln -sf ${haskell-backend}/bin/kore-repl $out/bin/kore-repl
ln -sf ${haskell-backend}/bin/kore-match-disjunction $out/bin/kore-match-disjunction
ln -sf ${llvm-backend-matching}/bin/llvm-backend-matching $out/bin/llvm-backend-matching
'';
in final [ ]