diff options
| -rw-r--r-- | pkgs/development/ruby-modules/tool/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/corundum/default.nix | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/ruby-modules/tool/default.nix b/pkgs/development/ruby-modules/tool/default.nix index 5a11218fdeab..9b8848592b2c 100644 --- a/pkgs/development/ruby-modules/tool/default.nix +++ b/pkgs/development/ruby-modules/tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv }@defs: +{ lib, stdenv, callPackage, runCommand, ruby }@defs: { name @@ -8,25 +8,26 @@ , exes ? [] # Scripts are ruby programs depend on gems in the Gemfile (e.g. scripts/rails) , scripts ? [] +, ruby ? defs.ruby , gemfile ? null , lockfile ? null , gemset ? null , preferLocalBuild ? false , allowSubstitutes ? false , meta ? {} -, postBuild +, postBuild ? "" }@args: let basicEnv = (callPackage ../bundled-common {}) args; - args = removeAttrs args_ [ "name" "postBuild" ] + cmdArgs = removeAttrs args [ "name" "postBuild" ] // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults in - runCommand name args '' - mkdir -p ${out}/bin; cd $out; + runCommand name cmdArgs '' + mkdir -p $out/bin; cd $out; ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' '${x}';\n") exes)} - ${(lib.concatMapStrings (s: "makeWrapper ${out}/bin/$(basename ${s}) $srcdir/${s} " + + ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ "--set BUNDLE_FROZEN 1 "+ diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix index 36f5bb06c349..53cb8e8f3b76 100644 --- a/pkgs/development/tools/corundum/default.nix +++ b/pkgs/development/tools/corundum/default.nix @@ -1,9 +1,11 @@ -{ rubyTool }: +{ lib, rubyTool }: rubyTool { name = "corundum-0.6.2"; gemdir = ./.; - meta = { + exes = [ "corundum-skel" ]; + + meta = with lib; { description = "Tool and libraries for maintaining Ruby gems."; homepage = http://sass-lang.com/; license = licenses.mit; |