summary refs log tree commit diff
diff options
context:
space:
mode:
authorJules Aguillon <juloo.dsi@gmail.com>2021-10-30 21:32:58 +0200
committerJules Aguillon <juloo.dsi@gmail.com>2021-10-30 21:32:58 +0200
commitb69d9d3c23311ce8b8512a7032600a5f8d1595ca (patch)
tree36f8f1ca4c4a767243c5ff1858010556c9d8ed87
parentf442ae9fc1a1f5a08d503dcedd490823a034af19 (diff)
downloadnixpkgs-b69d9d3c23311ce8b8512a7032600a5f8d1595ca.tar
nixpkgs-b69d9d3c23311ce8b8512a7032600a5f8d1595ca.tar.gz
nixpkgs-b69d9d3c23311ce8b8512a7032600a5f8d1595ca.tar.bz2
nixpkgs-b69d9d3c23311ce8b8512a7032600a5f8d1595ca.tar.lz
nixpkgs-b69d9d3c23311ce8b8512a7032600a5f8d1595ca.tar.xz
nixpkgs-b69d9d3c23311ce8b8512a7032600a5f8d1595ca.tar.zst
nixpkgs-b69d9d3c23311ce8b8512a7032600a5f8d1595ca.zip
xmonad: Don't add ghc to the closure when 'config' is set
When 'services.xserver.windowManager.xmonad.config' is not null, the
restart feature won't work by default and is not desirable unless
specific care is made, as explained by the documentation.

I think it's reasonable to not include the haskell dependencies in the
environment by default. That reduces the size of my system by 2GB.
-rw-r--r--nixos/modules/services/x11/window-managers/xmonad.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 6aa0d5f76f2..a8f38046137 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -29,7 +29,6 @@ let
       } ''
         install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz
         makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \
-          --set NIX_GHC "${xmonadEnv}/bin/ghc" \
           --set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage"
       '';
 
@@ -93,6 +92,8 @@ in {
           <literal>(restart "xmonad" True)</literal> instead, which will just restart
           xmonad from PATH. This allows e.g. switching to the new xmonad binary
           after rebuilding your system with nixos-rebuild.
+          For the same reason, ghc is not added to the environment when this
+          option is set.
 
           If you actually want to run xmonad with a config specified here, but
           also be able to recompile and restart it from a copy of that source in