various fixes

1 files changed, 18 insertions, 6 deletions

diff --git a/pkgs/development/interpreters/ruby/load-ruby-env.nix b/pkgs/development/interpreters/ruby/load-ruby-env.nix
index b73a9df9f83b..9e60e574b378 100644
--- a/pkgs/development/interpreters/ruby/load-ruby-env.nix
+++ b/pkgs/development/interpreters/ruby/load-ruby-env.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, callPackage, gemFixes }:
+{ pkgs, lib, callPackage, gemFixes, fetchurl }:
 
 { gemset, ruby ? pkgs.ruby, fixes ? gemFixes }@args:
 
@@ -7,19 +7,31 @@ let
 
   buildRubyGem = callPackage ./gem.nix { inherit ruby; };
 
-  instantiate = (name: attrs:
+  fetchers.gem = attrs: fetchurl {
+    url = "${attrs.src.source or "https://rubygems.org"}/downloads/${attrs.name}-${attrs.version}.gem";
+    inherit (attrs.src) sha256;
+  };
+
+  instantiate = (attrs:
     let
       gemPath = map (name: gemset''."${name}") (attrs.dependencies or []);
-      fixedAttrs = attrs // (fixes."${name}" or (const {})) attrs;
+      fixedAttrs = attrs // (fixes."${attrs.name}" or (const {})) attrs;
     in
-      buildRubyGem (fixedAttrs // { name = "${name}-${attrs.version}"; inherit gemPath; })
+      buildRubyGem (
+        fixedAttrs // {
+          name = "${attrs.name}-${attrs.version}";
+          src = fetchers."${attrs.src.type}" attrs;
+          inherit gemPath;
+        }
+      )
   );
 
   gemset' = if builtins.isAttrs gemset then gemset else callPackage gemset { };
 
   gemset'' = lib.flip lib.mapAttrs gemset' (name: attrs:
-    if (lib.isDerivation attrs) then attrs
-    else (instantiate name attrs)
+    if (lib.isDerivation attrs)
+      then attrs
+      else instantiate (attrs // { inherit name; })
   );
 
 in gemset''