Skip to content

Commit 2bcb47e

Browse files
mvnd: use finalAttrs (#520353)
2 parents 6f2f1fa + 5f732d0 commit 2bcb47e

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

pkgs/by-name/mv/mvnd/package.nix

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
installShellFiles,
66
makeWrapper,
77
maven,
8-
mvnd,
98
nix-update-script,
109
runCommand,
1110
stdenv,
@@ -19,16 +18,15 @@ let
1918
x86_64-darwin = "darwin-amd64";
2019
x86_64-linux = "linux-amd64";
2120
};
22-
inherit (platformMap.${stdenv.system}) os arch;
2321
in
2422

25-
maven.buildMavenPackage rec {
23+
maven.buildMavenPackage (finalAttrs: {
2624
pname = "mvnd";
2725
version = "1.0.5";
2826
src = fetchFromGitHub {
2927
owner = "apache";
3028
repo = "maven-mvnd";
31-
rev = version;
29+
rev = finalAttrs.version;
3230
sha256 = "sha256-/ODRS6xaxkn7okUh8phN1GUNG7tDAKjmAIQn8NrC+ag=";
3331
};
3432

@@ -42,7 +40,7 @@ maven.buildMavenPackage rec {
4240
makeWrapper
4341
];
4442

45-
mvnDepsParameters = mvnParameters;
43+
mvnDepsParameters = finalAttrs.mvnParameters;
4644
mvnParameters = lib.concatStringsSep " " (
4745
[
4846
"-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
@@ -69,7 +67,7 @@ maven.buildMavenPackage rec {
6967
mkdir -p $out/bin
7068
mkdir -p $out/mvnd-home
7169
72-
cp -r dist/target/maven-mvnd-${version}-${platformMap.${stdenv.system}}/* $out/mvnd-home
70+
cp -r dist/target/maven-mvnd-${finalAttrs.version}-${platformMap.${stdenv.system}}/* $out/mvnd-home
7371
makeWrapper $out/mvnd-home/bin/mvnd $out/bin/mvnd \
7472
--set-default MVND_HOME $out/mvnd-home
7573
@@ -89,13 +87,13 @@ maven.buildMavenPackage rec {
8987
package =
9088
runCommand "mvnd"
9189
{
92-
inherit version;
90+
inherit (finalAttrs) version;
9391
nativeBuildInputs = [ makeWrapper ];
9492
}
9593
''
9694
mkdir -p $out/bin
97-
makeWrapper ${mvnd}/bin/mvnd $out/bin/mvnd \
98-
--suffix PATH : ${lib.makeBinPath [ mvnJdk ]}
95+
makeWrapper ${finalAttrs.finalPackage}/bin/mvnd $out/bin/mvnd \
96+
--suffix PATH : ${lib.makeBinPath [ finalAttrs.mvnJdk ]}
9997
'';
10098
};
10199
});
@@ -108,4 +106,4 @@ maven.buildMavenPackage rec {
108106
maintainers = with lib.maintainers; [ nathanregner ];
109107
mainProgram = "mvnd";
110108
};
111-
}
109+
})

0 commit comments

Comments
 (0)