From ae84d19e651ddb09d22b31aae181fa6a500fdb65 Mon Sep 17 00:00:00 2001 From: Judson Date: Mon, 15 May 2017 09:36:30 -0700 Subject: Final testing --- pkgs/development/ruby-modules/bundler-env/basic.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/development/ruby-modules/bundler-env/basic.nix') diff --git a/pkgs/development/ruby-modules/bundler-env/basic.nix b/pkgs/development/ruby-modules/bundler-env/basic.nix index 80f12c14bfe..33a379c0275 100644 --- a/pkgs/development/ruby-modules/bundler-env/basic.nix +++ b/pkgs/development/ruby-modules/bundler-env/basic.nix @@ -5,7 +5,8 @@ }@defs: { - pname + name +, pname ? name , gemfile , lockfile , gemset @@ -77,7 +78,9 @@ let basicEnv = buildEnv { inherit ignoreCollisions; - name = pname; + name = if name == null then pname else name; + + #name = pname; paths = envPaths; pathsToLink = [ "/lib" ]; @@ -92,7 +95,8 @@ let passthru = rec { inherit ruby bundler gems mainGem confFiles; # drvName; - wrappedRuby = stdenv.mkDerivation { + wrappedRuby = + stdenv.mkDerivation { name = "wrapped-ruby-${pname}"; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' -- cgit 1.4.1