Merge pull request #231149 from mgregson/tlaplus-remove-unnecessary-jdk-dependency

This commit is contained in:
Janik 2023-06-26 18:15:28 +02:00 committed by GitHub
commit a2f36b2963
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View file

@ -10477,6 +10477,11 @@
githubId = 9469313; githubId = 9469313;
name = "Gregoire Martinache"; name = "Gregoire Martinache";
}; };
mgregson = {
github = "mgregson";
githubId = 333572;
name = "Michael Gregson";
};
mgttlinger = { mgttlinger = {
email = "megoettlinger@gmail.com"; email = "megoettlinger@gmail.com";
github = "mgttlinger"; github = "mgttlinger";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, adoptopenjdk-bin, jre }: { lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tlaplus"; pname = "tlaplus";
@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ adoptopenjdk-bin ];
dontUnpack = true; dontUnpack = true;
installPhase = '' installPhase = ''
@ -33,6 +32,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.mit; license = lib.licenses.mit;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ florentc thoughtpolice ]; maintainers = with lib.maintainers; [ florentc thoughtpolice mgregson ];
}; };
} }