From 59d5a65afb5f5c4d4ff2173a10ad6c31ecd97ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 15 Jul 2024 15:12:57 +0200 Subject: [PATCH] slipstream: stop overwriting maven --- pkgs/tools/games/slipstream/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index 522f9ec5d25b..f1fa38f893f8 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/tools/games/slipstream/default.nix @@ -1,8 +1,6 @@ { lib, fetchFromGitHub, makeWrapper, maven, jdk }: -let - mavenWithJdk = maven.override { inherit jdk; }; -in -mavenWithJdk.buildMavenPackage rec { + +maven.buildMavenPackage rec { pname = "slipstream"; version = "1.9.1"; @@ -13,6 +11,7 @@ mavenWithJdk.buildMavenPackage rec { hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU="; }; + mvnJdk = jdk; mvnHash = "sha256-woOSkF5TuzaJ84EndryMoXTMbbK/V/BShM1k+WB8D/c="; nativeBuildInputs = [ makeWrapper ];