Skip to content

Commit 5178484

Browse files
committed
metals: use fixed-point mkDerivation
This allows for instance for extraJavaOpts to be correctly overridden without needing to also implement the installPhase.
1 parent 049be2c commit 5178484

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkgs/by-name/me/metals/package.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
setJavaClassPath,
88
}:
99

10-
stdenv.mkDerivation rec {
10+
stdenv.mkDerivation (finalAttrs: {
1111
pname = "metals";
1212
version = "1.5.2";
1313

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

3535
dontUnpack = true;
3636

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040
mkdir -p $out/bin
4141
4242
makeWrapper ${jre}/bin/java $out/bin/metals \
43-
--add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
43+
--add-flags "${finalAttrs.extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
4444
'';
4545

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

0 commit comments

Comments
 (0)