Merge branch 'master' into flip-map-foreach

2019-08-18 18:00:25 +03:00
parent 29ba0a0adf 2ca09a94be
commit d80cd26ff9
1062 changed files with 25715 additions and 18328 deletions
@@ -15,8 +15,10 @@ let
    availablePlugins = let
        simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
      in rec {
-        python = {
-          pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+        python = (simplePlugin "python") // {
+          extraEnv = ''
+            export PATH="${pythonPackages.python}/bin:$PATH"
+          '';
          withPackages = pkgsFun: (python // {
            extraEnv = ''
              export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"