b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #175871 from Artturin/fixcross1

Browse source 
buildRubyGem: fix bundix cross
This commit is contained in:
Mario Rodas 2022-07-01 23:01:26 -05:00 committed by GitHub
parent 4ac46f52a9 6b8ce2acdf
commit ce577b822e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/ruby-modules/gem/default.nix
View file

@ -18,7 +18,7 @@
# Normal gem packages can be used outside of bundler; a binstub is created in # Normal gem packages can be used outside of bundler; a binstub is created in
# $out/bin. # $out/bin.
{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, darwin { lib, fetchurl, fetchgit, makeWrapper, gitMinimal, libobjc
, ruby, bundler , ruby, bundler
} @ defs: } @ defs:
@ -35,6 +35,7 @@ lib.makeOverridable (
, namePrefix ? (let , namePrefix ? (let
rubyName = builtins.parseDrvName ruby.name; rubyName = builtins.parseDrvName ruby.name;
in "${rubyName.name}${rubyName.version}-") in "${rubyName.name}${rubyName.version}-")
, nativeBuildInputs ? []
, buildInputs ? [] , buildInputs ? []
, meta ? {} , meta ? {}
, patches ? [] , patches ? []
@ -87,11 +88,15 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
inherit dontStrip; inherit dontStrip;
inherit type; inherit type;
buildInputs = [ nativeBuildInputs = [
ruby makeWrapper ruby makeWrapper
] ++ lib.optionals (type == "git") [ gitMinimal ] ] ++ lib.optionals (type == "git") [ gitMinimal ]
++ lib.optionals (type != "gem") [ bundler ] ++ lib.optionals (type != "gem") [ bundler ]
++ lib.optional stdenv.isDarwin darwin.libobjc ++ nativeBuildInputs;
buildInputs = [
ruby
] ++ lib.optionals stdenv.isDarwin [ libobjc ]
++ buildInputs; ++ buildInputs;
#name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}";

4
pkgs/top-level/all-packages.nix
View file

@ -14836,7 +14836,9 @@ with pkgs;
inherit (ocamlPackages) reason; 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 { defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (darwin) DarwinTools cctools; inherit (darwin) DarwinTools cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;