nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-24 01:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #299046 from ShamrockLee/jre-minimal-fix

Browse Source 
jre_minimal: convert `passthru.tests` to an attribute set and fix pre/post hook running
This commit is contained in:
Sandro
2024-08-02 00:16:53 +02:00
committed by GitHub
parent 3863a5e634 6a4cf944ef
commit e700287f93
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/openjdk/jre.nix
View File

@@ -30,10 +30,10 @@ let
passthru = {
home = "${jre}";
tests = [
(callPackage ./tests/test_jre_minimal.nix {})
(callPackage ./tests/test_jre_minimal_with_logging.nix {})
];
tests = {
jre_minimal-hello = callPackage ./tests/test_jre_minimal.nix {};
jre_minimal-hello-logging = callPackage ./tests/test_jre_minimal_with_logging.nix {};
};
};
};
in jre

8
pkgs/development/compilers/openjdk/tests/hello-logging.nix
View File

@@ -25,12 +25,12 @@ in
src = source;
buildPhase = ''
runHook preBuildPhase
runHook preBuild
${jdk}/bin/javac src/Hello.java
runHook postBuildPhase
runHook postBuild
'';
installPhase = ''
runHook preInstallPhase
runHook preInstall
mkdir -p $out/lib
cp src/Hello.class $out/lib
@@ -42,6 +42,6 @@ in
EOF
chmod a+x $out/bin/hello
runHook postInstallPhase
runHook postInstall
'';
}

8
pkgs/development/compilers/openjdk/tests/hello.nix
View File

@@ -20,12 +20,12 @@ in
src = source;
buildPhase = ''
runHook preBuildPhase
runHook preBuild
${jdk}/bin/javac src/Hello.java
runHook postBuildPhase
runHook postBuild
'';
installPhase = ''
runHook preInstallPhase
runHook preInstall
mkdir -p $out/lib
cp src/Hello.class $out/lib
@@ -37,6 +37,6 @@ in
EOF
chmod a+x $out/bin/hello
runHook postInstallPhase
runHook postInstall
'';
}