File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 9
9
in {
10
10
inherit sources ;
11
11
12
+ # match java version used by devs, this should also change the version used by sbt
13
+ jre = prev . jdk8 . jre ;
14
+
12
15
mantis = final . callPackage ./pkgs/mantis.nix {
13
- inherit ( prev . openjdk8_headless ) jre ;
14
16
src = cleanedSrc ;
15
17
} ;
16
18
} ;
Original file line number Diff line number Diff line change 6
6
, bash
7
7
, protobuf
8
8
, coreutils
9
- , jdk
10
- , jre
9
+ , jdk8
11
10
, gawk
12
11
, sbt
13
12
, impure ? false
33
32
34
33
exec ${ protobuf } /bin/protoc "$@"
35
34
'' ;
36
- nativeBuildInputs = [ protoc-wrapper jdk makeWrapper ] ;
35
+ nativeBuildInputs = [ protoc-wrapper jdk8 makeWrapper ] ;
37
36
38
37
# read version from build.sbt
39
38
version = let
42
41
in builtins . elemAt captures 0 ;
43
42
44
43
LD_LIBRARY_PATH = lib . makeLibraryPath [ stdenv . cc . cc . lib ] ;
45
- PATH = lib . makeBinPath [ coreutils jre gawk ] ;
44
+ PATH = lib . makeBinPath [ coreutils jdk8 . jre gawk ] ;
46
45
47
46
in sbt . mkDerivation {
48
47
pname = "mantis" ;
@@ -51,7 +50,7 @@ in sbt.mkDerivation {
51
50
52
51
# This sha represents the change dependencies of mantis.
53
52
# Update this sha whenever you change the dependencies
54
- depsSha256 = "sha256-yAaJUJgg5Sdnhr3mX85BquC3X1ygF6If/FOngMUIkPU= " ;
53
+ depsSha256 = "1zsf8yykr8a7p9za4lyw8l1rhqa7ppas049lawp9pn90sj0xkjh5 " ;
55
54
56
55
# this is the command used to to create the fixed-output-derivation
57
56
depsWarmupCommand = "sbt compile --debug -Dnix=true" ;
You can’t perform that action at this time.
0 commit comments