commit 92bb3e8b9bcbffe37c2e1c0efe467cdd018d6f14 · pyrox.dev/nixpkgs

+16 -1

nixos/modules/services/x11/window-managers/i3.nix

···

       36
       36
        
               i3 package to use.

     

       37
       37
        
             '';

     

       38
       38
        
           };

     

       39
       39
       +
       

     

       40
       40
       +
           extraPackages = mkOption {

     

       41
       41
       +
             type = with types; listOf package;

     

       42
       42
       +
             default = with pkgs; [ dmenu i3status i3lock ];

     

       43
       43
       +
             example = literalExample ''

     

       44
       44
       +
               with pkgs; [

     

       45
       45
       +
                 dmenu

     

       46
       46
       +
                 i3status

     

       47
       47
       +
                 i3lock

     

       48
       48
       +
               ]

     

       49
       49
       +
             '';

     

       50
       50
       +
             description = ''

     

       51
       51
       +
               Extra packages to be installed system wide.

     

       52
       52
       +
             '';

     

       53
       53
       +
           };

     

       39
       54
        
         };

     

       40
       55
        
       

     

       41
       56
        
         config = mkIf cfg.enable {

     
···

       50
       65
        
               waitPID=$!

     

       51
       66
        
             '';

     

       52
       67
        
           }];

     

       53
       53
       -
           environment.systemPackages = [ cfg.package ];

     

       68
       68
       +
           environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;

     

       54
       69
        
         };

     

       55
       70
        
       

     

       56
       71
        
         imports = [

+1 -8

pkgs/applications/window-managers/i3/default.nix

···

       1
       1
        
       { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms

     

       2
       2
        
       , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev

     

       3
       3
        
       , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon

     

       4
       4
       -
       , xorgserver, xvfb_run, dmenu, i3status }:

     

       4
       4
       +
       , xorgserver, xvfb_run }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "i3-${version}";

     
···

       28
       28
        
       

     

       29
       29
        
         postPatch = ''

     

       30
       30
        
           patchShebangs .

     

       31
       31
       -
         '';

     

       32
       32
       -
       

     

       33
       33
       -
         postFixup = ''

     

       34
       34
       -
           substituteInPlace $out/etc/i3/config --replace dmenu_run ${dmenu}/bin/dmenu_run

     

       35
       35
       -
           substituteInPlace $out/etc/i3/config --replace "status_command i3status" "status_command ${i3status}/bin/i3status"

     

       36
       36
       -
           substituteInPlace $out/etc/i3/config.keycodes --replace dmenu_run ${dmenu}/bin/dmenu_run

     

       37
       37
       -
           substituteInPlace $out/etc/i3/config.keycodes --replace "status_command i3status" "status_command ${i3status}/bin/i3status"

     

       38
       31
        
         '';

     

       39
       32
        
       

     

       40
       33
        
         # Tests have been failing (at least for some people in some cases)