diff options
| author | Robin Gloster <mail@glob.in> | 2017-07-30 00:03:24 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-07-30 00:03:24 +0200 |
| commit | 0154d1b03fc19071b950d0fdaa1470211a03d333 (patch) | |
| tree | 23cb4af55c92168e7df4156bb8b36766f0494138 /pkgs/development/ruby-modules/bundled-common/default.nix | |
| parent | 06a513ee05b9ad7a85ec9680e137284ef68ba72a (diff) | |
| download | nixpkgs-0154d1b03fc19071b950d0fdaa1470211a03d333.tar nixpkgs-0154d1b03fc19071b950d0fdaa1470211a03d333.tar.gz nixpkgs-0154d1b03fc19071b950d0fdaa1470211a03d333.tar.bz2 nixpkgs-0154d1b03fc19071b950d0fdaa1470211a03d333.tar.lz nixpkgs-0154d1b03fc19071b950d0fdaa1470211a03d333.tar.xz nixpkgs-0154d1b03fc19071b950d0fdaa1470211a03d333.tar.zst nixpkgs-0154d1b03fc19071b950d0fdaa1470211a03d333.zip | |
fix evaluation
cc @nyarly
Diffstat (limited to 'pkgs/development/ruby-modules/bundled-common/default.nix')
| -rw-r--r-- | pkgs/development/ruby-modules/bundled-common/default.nix | 11 |
1 files 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 1bf6257f655..64a88d8f7b8 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 |