diff options
author | mib <mib@kanp.ai> | 2023-07-04 00:21:46 +0200 |
---|---|---|
committer | mib <mib@kanp.ai> | 2023-07-04 00:21:46 +0200 |
commit | daf9c822dd68da88aaf6ab777cca8b2c2fcfafaf (patch) | |
tree | ee40514b56ad2773617ef0ef9bb2df87e29f5022 | |
parent | aacc904981c803ae89d017ea1737a160932af9ef (diff) | |
download | nixpkgs-daf9c822dd68da88aaf6ab777cca8b2c2fcfafaf.tar nixpkgs-daf9c822dd68da88aaf6ab777cca8b2c2fcfafaf.tar.gz nixpkgs-daf9c822dd68da88aaf6ab777cca8b2c2fcfafaf.tar.bz2 nixpkgs-daf9c822dd68da88aaf6ab777cca8b2c2fcfafaf.tar.lz nixpkgs-daf9c822dd68da88aaf6ab777cca8b2c2fcfafaf.tar.xz nixpkgs-daf9c822dd68da88aaf6ab777cca8b2c2fcfafaf.tar.zst nixpkgs-daf9c822dd68da88aaf6ab777cca8b2c2fcfafaf.zip |
slipstream: get jdk from args
-rw-r--r-- | pkgs/tools/games/slipstream/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index d55076bae65..8559a3e37cd 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/tools/games/slipstream/default.nix @@ -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 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a6baba93f3..3a753865d62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |