diff options
| author | Raitis Veinbahs <wimuan@gmail.com> | 2018-04-15 13:53:15 +0300 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2018-04-15 11:53:15 +0100 |
| commit | a6a2e75804da87f9f68f7261e39511d72e8aab7d (patch) | |
| tree | 32ce13842e489e76c6f281d8d6e71310df29b6d1 /pkgs/development/ruby-modules/bundled-common | |
| parent | 92f0d31b949bcf018262252408b8a69376a6cb68 (diff) | |
| download | nixpkgs-a6a2e75804da87f9f68f7261e39511d72e8aab7d.tar nixpkgs-a6a2e75804da87f9f68f7261e39511d72e8aab7d.tar.gz nixpkgs-a6a2e75804da87f9f68f7261e39511d72e8aab7d.tar.bz2 nixpkgs-a6a2e75804da87f9f68f7261e39511d72e8aab7d.tar.lz nixpkgs-a6a2e75804da87f9f68f7261e39511d72e8aab7d.tar.xz nixpkgs-a6a2e75804da87f9f68f7261e39511d72e8aab7d.tar.zst nixpkgs-a6a2e75804da87f9f68f7261e39511d72e8aab7d.zip | |
ruby-modules: Import gemset if it's a path OR a string. (#38959)
This fixes the bug introduced by 8686b98612dc which broke bundlerEnv exprs when gemdir was a string (thus making gemset a string by `gemset = gemdir + "/gemset.nix"`) which made it being treated as a set.
Diffstat (limited to 'pkgs/development/ruby-modules/bundled-common')
| -rw-r--r-- | pkgs/development/ruby-modules/bundled-common/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 1f31aec886a..16f1abe1a89 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -29,7 +29,7 @@ with import ./functions.nix { inherit lib gemConfig; }; let gemFiles = bundlerFiles args; - importedGemset = if builtins.typeOf gemFiles.gemset == "path" + importedGemset = if builtins.typeOf gemFiles.gemset != "set" then import gemFiles.gemset else gemFiles.gemset; |