Skip to content

Commit

Permalink
fix evaluation
Browse files Browse the repository at this point in the history
  • Loading branch information
globin committed Jul 29, 2017
1 parent 06a513e commit 0154d1b
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions pkgs/development/ruby-modules/bundled-common/default.nix
Expand Up @@ -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/" #*/

This comment has been minimized.

Copy link
@zimbatm

zimbatm Jul 31, 2017

Member

is this for your editor's syntax highlighter?

This comment has been minimized.

Copy link
@globin

globin Jul 31, 2017

Author Member

Yes, I actually didn't want to commit that, but forgot, but doesn't do any harm..

This comment has been minimized.

Copy link
@zimbatm

zimbatm Jul 31, 2017

Member

yes just double-checking

else ""
);

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 0154d1b

Please sign in to comment.