colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #288463 from MidAutumnMoon/ruby-finalattrs

Browse Source 
ruby: replace `rec {}` with `finalAttrs` & make overriding possible
This commit is contained in:
Mario Rodas 2024-02-17 11:28:27 -05:00 committed by GitHub
commit c06b377b63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/interpreters/ruby/default.nix
View File

@ -24,7 +24,7 @@ let
atLeast32 = lib.versionAtLeast ver.majMin "3.2";
# https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21
yjitSupported = atLeast32 && (stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64));
self = lib.makeOverridable (
rubyDrv = lib.makeOverridable (
{ stdenv, buildPackages, lib
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
, rubygemsSupport ? true
@ -58,7 +58,7 @@ let
}
, useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation ( finalAttrs: {
pname = "ruby";
inherit version;
@ -123,8 +123,8 @@ let
cargoRoot = opString yjitSupport "yjit";
cargoDeps = if yjitSupport then rustPlatform.fetchCargoTarball {
inherit src;
sourceRoot = "${pname}-${version}/${cargoRoot}";
inherit (finalAttrs) src;
sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}";
hash = cargoHash;
} else null;
@ -175,8 +175,8 @@ let
preInstall = ''
# Ruby installs gems here itself now.
mkdir -pv "$out/${passthru.gemPath}"
export GEM_HOME="$out/${passthru.gemPath}"
mkdir -pv "$out/${finalAttrs.passthru.gemPath}"
export GEM_HOME="$out/${finalAttrs.passthru.gemPath}"
'';
installFlags = lib.optional docSupport "install-doc";
@ -205,16 +205,16 @@ let
sed -i 's/CONFIG\["CC"\] = "\(.*\)"/CONFIG["CC"] = if ENV["CC"].nil? || ENV["CC"].empty? then "\1" else ENV["CC"] end/' "$rbConfig"
# Remove unnecessary external intermediate files created by gems
extMakefiles=$(find $out/${passthru.gemPath} -name Makefile)
extMakefiles=$(find $out/${finalAttrs.passthru.gemPath} -name Makefile)
for makefile in $extMakefiles; do
make -C "$(dirname "$makefile")" distclean
done
find "$out/${passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log \) -delete
find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log \) -delete
# Bundler tries to create this directory
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}
}
addRubyLibPath() {
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
@ -274,21 +274,20 @@ let
gemPath = "lib/${rubyEngine}/gems/${ver.libDir}";
devEnv = import ./dev.nix {
inherit buildEnv bundler bundix;
ruby = self;
ruby = finalAttrs.finalPackage;
};
inherit rubygems;
inherit (import ../../ruby-modules/with-packages {
inherit lib stdenv makeBinaryWrapper buildRubyGem buildEnv;
gemConfig = defaultGemConfig;
ruby = self;
ruby = finalAttrs.finalPackage;
}) withPackages buildGems gems;
} // lib.optionalAttrs useBaseRuby {
inherit baseRuby;
};
}
) args; in self;
} )
) args; in rubyDrv;
in {
mkRubyVersion = rubyVersion;