alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

jruby: Use finalAttrs pattern

Browse source
This commit is contained in:
Mario Rodas 2023-06-11 04:20:00 +00:00
parent 76a2ed5ef5
commit 671243193c
1 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/development/interpreters/jruby/default.nix
View file

@ -1,15 +1,15 @@
{ lib, stdenv, callPackage, fetchurl, makeBinaryWrapper, jre }:
{ lib, stdenv, callPackage, fetchurl, mkRubyVersion, makeBinaryWrapper, jre }:
let
# The version number here is whatever is reported by the RUBY_VERSION string
rubyVersion = callPackage ../ruby/ruby-version.nix {} "3" "1" "4" "";
jruby = stdenv.mkDerivation rec {
rubyVersion = mkRubyVersion "3" "1" "4" "";
in
stdenv.mkDerivation (finalAttrs: {
pname = "jruby";
version = "9.4.3.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz";
hash = "sha256-sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk=";
};
@ -30,11 +30,11 @@ jruby = stdenv.mkDerivation rec {
ln -s $out/bin/jruby $out/bin/ruby
# Bundler tries to create this directory
mkdir -pv $out/${passthru.gemPath}
mkdir -pv $out/${finalAttrs.passthru.gemPath}
mkdir -p $out/nix-support
cat > $out/nix-support/setup-hook <<EOF
addGemPath() {
addToSearchPath GEM_PATH \$1/${passthru.gemPath}
addToSearchPath GEM_PATH \$1/${finalAttrs.passthru.gemPath}
}
addEnvHooks "$hostOffset" addGemPath
@ -49,6 +49,9 @@ jruby = stdenv.mkDerivation rec {
rubyEngine = "jruby";
gemPath = "lib/${rubyEngine}/gems/${rubyVersion.libDir}";
libPath = "lib/${rubyEngine}/${rubyVersion.libDir}";
devEnv = callPackage ../ruby/dev.nix {
ruby = finalAttrs.finalPackage;
};
};
meta = with lib; {
@ -60,11 +63,4 @@ jruby = stdenv.mkDerivation rec {
maintainers = [ maintainers.fzakaria ];
sourceProvenance = with sourceTypes; [ binaryBytecode ];
};
};
in jruby.overrideAttrs (oldAttrs: {
passthru = oldAttrs.passthru // {
devEnv = callPackage ../ruby/dev.nix {
ruby = jruby;
};
};
})