From a6a2e75804da87f9f68f7261e39511d72e8aab7d Mon Sep 17 00:00:00 2001 From: Raitis Veinbahs Date: Sun, 15 Apr 2018 13:53:15 +0300 Subject: [PATCH] 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. --- pkgs/development/ruby-modules/bundled-common/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;