nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

slipstream: get jdk from args

Browse Source
This commit is contained in:
mib 2023-07-04 00:21:46 +02:00
parent aacc904981
commit daf9c822dd
No known key found for this signature in database
GPG Key ID: CF6E67DED6DC1E3F
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/games/slipstream/default.nix
View File

@ -1,6 +1,5 @@
{ lib, fetchFromGitHub, stdenv, makeWrapper, buildMaven, maven, jdk8 }:
{ lib, fetchFromGitHub, stdenv, makeWrapper, buildMaven, maven, jdk }:
let
jdk = jdk8;
mavenWithJdk = maven.override { inherit jdk; };
in
mavenWithJdk.buildMavenPackage rec {

4
pkgs/top-level/all-packages.nix
View File

@ -1783,7 +1783,9 @@ with pkgs;
sitespeed-io = callPackage ../tools/networking/sitespeed-io { };
slipstream = callPackage ../tools/games/slipstream { };
slipstream = callPackage ../tools/games/slipstream {
jdk = jdk8;
};
sorted-grep = callPackage ../tools/text/sorted-grep { };