diff options
author | Artturin <Artturin@artturin.com> | 2022-06-02 16:04:21 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-07-01 19:19:11 +0300 |
commit | 6b8ce2acdf842f17878c4f059ccede137eb9b199 (patch) | |
tree | 1ce412211b717fb54a550b0b1cf97c5dfc619206 | |
parent | a720bc44c23c80a49dab05c7907c2e58681b425d (diff) | |
download | nixpkgs-6b8ce2acdf842f17878c4f059ccede137eb9b199.tar nixpkgs-6b8ce2acdf842f17878c4f059ccede137eb9b199.tar.gz nixpkgs-6b8ce2acdf842f17878c4f059ccede137eb9b199.tar.bz2 nixpkgs-6b8ce2acdf842f17878c4f059ccede137eb9b199.tar.lz nixpkgs-6b8ce2acdf842f17878c4f059ccede137eb9b199.tar.xz nixpkgs-6b8ce2acdf842f17878c4f059ccede137eb9b199.tar.zst nixpkgs-6b8ce2acdf842f17878c4f059ccede137eb9b199.zip |
buildRubyGem: inherit libobjc from darwin
-rw-r--r-- | pkgs/development/ruby-modules/gem/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 649d33c4646..e5f9d045a5b 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -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: @@ -96,7 +96,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { buildInputs = [ ruby - ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ] + ] ++ lib.optionals stdenv.isDarwin [ libobjc ] ++ buildInputs; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad446e147f..ec65625a41e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |