From 24e0fc99f9fecc817d917944f937648c7de119f2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Jan 2016 23:27:06 +0000 Subject: [PATCH] buildRubyGem: remove unecessary duplication --- .../ruby/build-ruby-gem/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix index c5b9fba37aa..effd343ecfd 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix @@ -50,24 +50,24 @@ lib.makeOverridable ( , passthru ? {} , ...} @ attrs: -if ! builtins.elem type [ "git" "gem" ] -then throw "buildRubyGem: don't know how to build a gem of type \"${type}\"" -else - let shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; rubygems = (attrs.rubygems or defs.rubygems).override { inherit ruby; }; src = attrs.src or ( - if type == "gem" - then fetchurl { - urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes; - inherit (attrs) sha256; - } else fetchgit { - inherit (attrs) url rev sha256 fetchSubmodules; - leaveDotGit = true; - } + if type == "gem" then + fetchurl { + urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes; + inherit (attrs) sha256; + } + else if type == "git" then + fetchgit { + inherit (attrs) url rev sha256 fetchSubmodules; + leaveDotGit = true; + } + else + throw "buildRubyGem: don't know how to build a gem of type \"${type}\"" ); documentFlag = if document == []