public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix evaluation

Browse Source 
cc @nyarly
This commit is contained in:
Robin Gloster 2017-07-30 00:03:24 +02:00
parent 06a513ee05
commit 0154d1b03f
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/ruby-modules/bundled-common/default.nix
View File

@ -61,7 +61,7 @@ let
copyIfBundledByPath = { bundledByPath ? false, ...}@main: copyIfBundledByPath = { bundledByPath ? false, ...}@main:
(if bundledByPath then (if bundledByPath then
assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/
else "" else ""
); );
@ -109,11 +109,10 @@ let
meta = { platforms = ruby.meta.platforms; } // meta; meta = { platforms = ruby.meta.platforms; } // meta;
passthru = rec { passthru = rec {
inherit ruby bundler gems mainGem confFiles envPaths; inherit ruby bundler gems confFiles envPaths;
wrappedRuby = wrappedRuby = stdenv.mkDerivation {
stdenv.mkDerivation { name = "wrapped-ruby-${pname'}";
name = "wrapped-ruby-${pname}";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
@ -137,7 +136,7 @@ let
require 'bundler/setup' require 'bundler/setup'
''; '';
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${pname}-interactive-environment"; name = "${pname'}-interactive-environment";
nativeBuildInputs = [ wrappedRuby basicEnv ]; nativeBuildInputs = [ wrappedRuby basicEnv ];
shellHook = '' shellHook = ''
export OLD_IRBRC=$IRBRC export OLD_IRBRC=$IRBRC