Merge master into staging-next

2021-03-12 06:17:54 +00:00
parent 83156b83f1 f03cfcafbf
commit 121cc02fe8
17 changed files with 482 additions and 309 deletions
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -23,7 +23,7 @@ jruby = stdenv.mkDerivation rec {

     for i in $out/bin/jruby{,.bash}; do
       wrapProgram $i \
-         --set JAVA_HOME ${jre}
+         --set JAVA_HOME ${jre.home}
     done

     ln -s $out/bin/jruby $out/bin/ruby