From 9c8c4c8655bd005b56643ae58dcd86eab1f9e424 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Mon, 18 Aug 2014 14:53:41 -0700 Subject: [PATCH] reorder gem phases --- pkgs/development/interpreters/ruby/gem.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index e226d5cf9e0..b3b18e7bbe0 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -3,7 +3,7 @@ { name , namePrefix ? "ruby${ruby.majorVersion}" + "-" , buildInputs ? [] -, doCheck ? false +, doCheck ? false # TODO: fix this , dontBuild ? true , meta ? {} , gemPath ? [] @@ -37,19 +37,10 @@ in ruby.stdenv.mkDerivation (attrs // { fi ''; - buildPhase = '' - runHook preBuild - test -d .git || { - chmod 755 . - ${git}/bin/git init - ${git}/bin/git add . - } - if gem build *.gemspec; then - export src=*.gem - else - echo >&2 "gemspec missing, not rebuilding gem" - fi - runHook postBuild + checkPhase = '' + runHook preCheck + ${attrs.checkPhase or "${rake}/bin/rake spec"} + runHook postCheck ''; installPhase = ''