Merge remote-tracking branch 'upstream/master' into staging

2018-05-14 13:31:20 -04:00
parent d00cc1242f 405f9d10ef
commit 01a525b84e
12 changed files with 22 additions and 50 deletions
--- a/nixos/modules/services/x11/window-managers/stumpwm.nix
+++ b/nixos/modules/services/x11/window-managers/stumpwm.nix
@@ -15,10 +15,10 @@ in
    services.xserver.windowManager.session = singleton {
      name = "stumpwm";
      start = ''
-        ${pkgs.stumpwm}/bin/stumpwm &
+        ${pkgs.lispPackages.stumpwm}/bin/stumpwm &
        waitPID=$!
      '';
    };
-    environment.systemPackages = [ pkgs.stumpwm ];
+    environment.systemPackages = [ pkgs.lispPackages.stumpwm ];
  };
 }