Skip to content

buildRubyGem: fix bundix cross #175871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marsam merged 2 commits into from
Jul 2, 2022
Merged

buildRubyGem: fix bundix cross #175871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a720bc4
buildRubyGem: fix bundix cross
Artturin Jun 1, 2022
6b8ce2a
buildRubyGem: inherit libobjc from darwin
Artturin Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pkgs/development/ruby-modules/gem/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Normal gem packages can be used outside of bundler; a binstub is created in
# $out/bin.

{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, darwin
{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, libobjc
, ruby, bundler
} @ defs:

Expand All @@ -35,6 +35,7 @@ lib.makeOverridable (
, namePrefix ? (let
rubyName = builtins.parseDrvName ruby.name;
in "${rubyName.name}${rubyName.version}-")
, nativeBuildInputs ? []
, buildInputs ? []
, meta ? {}
, patches ? []
Expand Down Expand Up @@ -87,11 +88,15 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
inherit dontStrip;
inherit type;

buildInputs = [
nativeBuildInputs = [
ruby makeWrapper
] ++ lib.optionals (type == "git") [ gitMinimal ]
++ lib.optionals (type != "gem") [ bundler ]
++ lib.optional stdenv.isDarwin darwin.libobjc
++ nativeBuildInputs;

buildInputs = [
ruby
Copy link
Member

@zimbatm zimbatm Jun 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't ruby be in the nativeBuildInputs only?

Copy link
Member Author

@Artturin Artturin Jun 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't ruby be in the nativeBuildInputs only?

ruby contains libraries and addGemPath,addRubyLibPath envHooks which add paths from buildInputs to GEM_PATH and RUBYLIB

] ++ lib.optionals stdenv.isDarwin [ libobjc ]
++ buildInputs;

#name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}";
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14584,7 +14584,9 @@ with pkgs;

inherit (ocamlPackages) reason;

buildRubyGem = callPackage ../development/ruby-modules/gem { };
buildRubyGem = callPackage ../development/ruby-modules/gem {
inherit (darwin) libobjc;
};
defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (darwin) DarwinTools cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
Expand Down