Skip to content

Commit aae9ff5

Browse files
author
Dmitry Voronov
authored
Merge pull request #885 from input-output-hk/use-jdk8-nix
Use only jdk8 when building nix
2 parents ec36746 + 0f57d0e commit aae9ff5

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

nix/default.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ let
99
in {
1010
inherit sources;
1111

12+
# match java version used by devs, this should also change the version used by sbt
13+
jre = prev.jdk8.jre;
14+
1215
mantis = final.callPackage ./pkgs/mantis.nix {
13-
inherit (prev.openjdk8_headless) jre;
1416
src = cleanedSrc;
1517
};
1618
};

nix/pkgs/mantis.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
, bash
77
, protobuf
88
, coreutils
9-
, jdk
10-
, jre
9+
, jdk8
1110
, gawk
1211
, sbt
1312
, impure ? false
@@ -33,7 +32,7 @@ let
3332
3433
exec ${protobuf}/bin/protoc "$@"
3534
'';
36-
nativeBuildInputs = [ protoc-wrapper jdk makeWrapper ];
35+
nativeBuildInputs = [ protoc-wrapper jdk8 makeWrapper ];
3736

3837
# read version from build.sbt
3938
version = let
@@ -42,7 +41,7 @@ let
4241
in builtins.elemAt captures 0;
4342

4443
LD_LIBRARY_PATH = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
45-
PATH = lib.makeBinPath [ coreutils jre gawk ];
44+
PATH = lib.makeBinPath [ coreutils jdk8.jre gawk ];
4645

4746
in sbt.mkDerivation {
4847
pname = "mantis";
@@ -51,7 +50,7 @@ in sbt.mkDerivation {
5150

5251
# This sha represents the change dependencies of mantis.
5352
# Update this sha whenever you change the dependencies
54-
depsSha256 = "sha256-yAaJUJgg5Sdnhr3mX85BquC3X1ygF6If/FOngMUIkPU=";
53+
depsSha256 = "1zsf8yykr8a7p9za4lyw8l1rhqa7ppas049lawp9pn90sj0xkjh5";
5554

5655
# this is the command used to to create the fixed-output-derivation
5756
depsWarmupCommand = "sbt compile --debug -Dnix=true";

0 commit comments

Comments
 (0)