From 0154d1b03fc19071b950d0fdaa1470211a03d333 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sun, 30 Jul 2017 00:03:24 +0200 Subject: [PATCH] fix evaluation cc @nyarly --- .../ruby-modules/bundled-common/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 1bf6257f6559..64a88d8f7b83 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -61,7 +61,7 @@ let copyIfBundledByPath = { bundledByPath ? false, ...}@main: (if bundledByPath then - assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" + assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/ else "" ); @@ -109,11 +109,10 @@ let meta = { platforms = ruby.meta.platforms; } // meta; passthru = rec { - inherit ruby bundler gems mainGem confFiles envPaths; + inherit ruby bundler gems confFiles envPaths; - wrappedRuby = - stdenv.mkDerivation { - name = "wrapped-ruby-${pname}"; + wrappedRuby = stdenv.mkDerivation { + name = "wrapped-ruby-${pname'}"; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin @@ -137,7 +136,7 @@ let require 'bundler/setup' ''; in stdenv.mkDerivation { - name = "${pname}-interactive-environment"; + name = "${pname'}-interactive-environment"; nativeBuildInputs = [ wrappedRuby basicEnv ]; shellHook = '' export OLD_IRBRC=$IRBRC