diff --git a/matching/pom.xml b/matching/pom.xml index 5b1ee7828..66ec6d4ab 100644 --- a/matching/pom.xml +++ b/matching/pom.xml @@ -75,6 +75,11 @@ 1.4 linux64 + + org.scala-sbt + compiler-bridge_2.12 + 1.8.0 + diff --git a/nix/llvm-backend-matching.nix b/nix/llvm-backend-matching.nix index 4dcaf0063..bdb7772dc 100644 --- a/nix/llvm-backend-matching.nix +++ b/nix/llvm-backend-matching.nix @@ -12,11 +12,17 @@ let self = maven.buildMavenPackage rec { "org.apache.maven.plugins:maven-compiler-plugin:3.7.0" ]; + manualMvnSourceArtifacts = [ + "org.scala-sbt:compiler-bridge_2.12" + ]; + passthru = { jar = "${self}/share/java/llvm-backend-matching-1.0-SNAPSHOT-jar-with-dependencies.jar"; }; + mvnParameters = "-DsecondaryCacheDir=secondary-cache"; + installPhase = '' mkdir -p $out/share/java install -Dm644 target/*.jar $out/share/java diff --git a/nix/overlay.nix b/nix/overlay.nix index 82bb62a16..1f96aedee 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -21,7 +21,7 @@ let llvm-backend-matching = import ./llvm-backend-matching.nix { src = prev.llvm-backend-matching-src; - mvnHash = "sha256-5wHyZF/a4seBo3gOHXkhNJimMyUaXxlSSbMeBH7ET7k="; + mvnHash = "sha256-2X8G3T05Pk1apA0f04Mdu/8DAB89oB9XwTBQ3KVoc/A="; inherit (final) maven; };