Unverified Commit 566ce223 authored by Felix Bargfeldt's avatar Felix Bargfeldt Committed by GitHub
Browse files

metals: use fixed-point mkDerivation (#399829)

parents b4f5e9ff 5178484f
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -7,15 +7,15 @@
  setJavaClassPath,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "metals";
  version = "1.5.2";

  deps = stdenv.mkDerivation {
    name = "${pname}-deps-${version}";
    name = "metals-deps-${finalAttrs.version}";
    buildCommand = ''
      export COURSIER_CACHE=$(pwd)
      ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${version} \
      ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${finalAttrs.version} \
        -r bintray:scalacenter/releases \
        -r sonatype:snapshots > deps
      mkdir -p $out/share/java
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    makeWrapper
    setJavaClassPath
  ];
  buildInputs = [ deps ];
  buildInputs = [ finalAttrs.deps ];

  dontUnpack = true;

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
    mkdir -p $out/bin

    makeWrapper ${jre}/bin/java $out/bin/metals \
      --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
      --add-flags "${finalAttrs.extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
  '';

  meta = with lib; {
@@ -54,4 +54,4 @@ stdenv.mkDerivation rec {
      tomahna
    ];
  };
}
})