Skip to content

Commit

Permalink
neovim: Fix eval error
Browse files Browse the repository at this point in the history 
Not sure at all if this is the right thing to do. cc @edanaher
  • Loading branch information
@dezgeg
dezgeg committed Mar 18, 2017
1 parent 194ff8a commit 5658324
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/editors/neovim/default.nix
View file
Expand Up @@ -53,7 +53,7 @@ let
rubyWrapper = ''--suffix PATH : \"${rubyEnv}/bin\" '' +
''--suffix GEM_HOME : \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" '';

pluginPythonPackages = builtins.concatLists
pluginPythonPackages = if configure == null then [] else builtins.concatLists
(map ({ pythonDependencies ? [], ...}: pythonDependencies)
(vimUtils.requiredPlugins configure));
pythonEnv = pythonPackages.python.buildEnv.override {
Expand All @@ -66,7 +66,7 @@ let
};
pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '';

pluginPython3Packages = builtins.concatLists
pluginPython3Packages = if configure == null then [] else builtins.concatLists
(map ({ python3Dependencies ? [], ...}: python3Dependencies)
(vimUtils.requiredPlugins configure));
python3Env = python3Packages.python.buildEnv.override {
Expand Down

1 comment on commit 5658324

@edanaher
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That certainly looks like a good solution; I would probably use optionals (configure != null) here (or possibly below where pluginPython[3]Packages is used), but I think that's stylistic preference, and I'm certainly no expert on nix style.

And sorry about that error; I didn't think to test without a configuration. It seems like a gap in the testing that (AFAICT) this (#23256) didn't trigger a travis-ci tests because it didn't change any default builds; it seems like a hard problem to fix, but potentially one worth thinking about...

Please sign in to comment.