diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 11:29:08 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 11:29:08 +0100 |
commit | 710028664e26e85cb831a869b3da9f6993902255 (patch) | |
tree | 8323cf9ea7f8eed6dc9befefa9643320556d5130 /modules/workstation/weechat/default.nix | |
parent | 5391a22d71837a57a73b31d05f662209be87627b (diff) | |
download | nixlib-710028664e26e85cb831a869b3da9f6993902255.tar nixlib-710028664e26e85cb831a869b3da9f6993902255.tar.gz nixlib-710028664e26e85cb831a869b3da9f6993902255.tar.bz2 nixlib-710028664e26e85cb831a869b3da9f6993902255.tar.lz nixlib-710028664e26e85cb831a869b3da9f6993902255.tar.xz nixlib-710028664e26e85cb831a869b3da9f6993902255.tar.zst nixlib-710028664e26e85cb831a869b3da9f6993902255.zip |
Revert "modules/weechat: pin to Python 3.9"
This reverts commit dc58263f7abd0b3154f84e953cf58c40e91e61d6. The hang on exit bug appears to have been fixed.
Diffstat (limited to 'modules/workstation/weechat/default.nix')
-rw-r--r-- | modules/workstation/weechat/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/modules/workstation/weechat/default.nix b/modules/workstation/weechat/default.nix index 36f5284f7495..95ba03c1ecdc 100644 --- a/modules/workstation/weechat/default.nix +++ b/modules/workstation/weechat/default.nix @@ -3,15 +3,7 @@ with lib; let - weechatScripts = pkgs.weechatScripts.override { - python3Packages = pkgs.python39Packages; - }; - - weechatWrapper = with pkgs; wrapWeechat (weechat-unwrapped.override { - python3Packages = python39Packages; - }); - - scripts = with weechatScripts; + scripts = with pkgs.weechatScripts; [ colorize_nicks weechat-go weechat-matrix zncplayback ]; networks = [ @@ -119,7 +111,7 @@ let # to WeeChat before the /script loads, so scripts wouldn't be # available and we wouldn't be able to do stuff like set up Matrix. cfg = pkgs.runCommand "weechat-config" {} '' - LC_ALL=C.UTF-8 ${weechatWrapper { + LC_ALL=C.UTF-8 ${pkgs.weechat.override { configure = { ... }: { inherit scripts; init = concatStringsSep ";" (commands ++ [ "/save" "/exit" ]); @@ -137,7 +129,7 @@ in ''; environment.systemPackages = with pkgs; [ - (weechatWrapper { + (weechat.override { configure = { ...}: { inherit scripts; }; |