commit 60f2af59385bb58b57df3e0df621dbb216fcd39e · pyrox.dev/nixpkgs

+6 -2

nixos/modules/programs/sway.nix

···

       31
       31
        
           extraOptions = cfg.extraOptions;

     

       32
       32
        
           withBaseWrapper = cfg.wrapperFeatures.base;

     

       33
       33
        
           withGtkWrapper = cfg.wrapperFeatures.gtk;

     

       34
       34
       +
           isNixOS = true;

     

       34
       35
        
         };

     

       35
       36
        
       in {

     

       36
       37
        
         options.programs.sway = {

     
···

       120
       121
        
             systemPackages = [ swayPackage ] ++ cfg.extraPackages;

     

       121
       122
        
             etc = {

     

       122
       123
        
               "sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config";

     

       123
       123
       -
               #"sway/security.d".source = mkOptionDefault "${swayPackage}/etc/sway/security.d/";

     

       124
       124
       -
               #"sway/config.d".source = mkOptionDefault "${swayPackage}/etc/sway/config.d/";

     

       124
       124
       +
               "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" ''

     

       125
       125
       +
                 # Import the most important environment variables into the D-Bus and systemd

     

       126
       126
       +
                 # user environments (e.g. required for screen sharing and Pinentry prompts):

     

       127
       127
       +
                 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK

     

       128
       128
       +
               '';

     

       125
       129
        
             };

     

       126
       130
        
           };

     

       127
       131
        
           security.pam.services.swaylock = {};

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

···

       4
       4
        
       , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg

     

       5
       5
        
       , wlroots, wayland-protocols, libdrm

     

       6
       6
        
       , nixosTests

     

       7
       7
       +
       # Used by the NixOS module:

     

       8
       8
       +
       , isNixOS ? false

     

       7
       9
        
       }:

     

       8
       10
        
       

     

       9
       11
        
       stdenv.mkDerivation rec {

     
···

       26
       28
        
             inherit swaybg;

     

       27
       29
        
           })

     

       28
       30
        
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         postPatch = lib.optionalString isNixOS ''

     

       33
       33
       +
           echo -e '\ninclude /etc/sway/config.d/*' >> config.in

     

       34
       34
       +
         '';

     

       29
       35
        
       

     

       30
       36
        
         nativeBuildInputs = [

     

       31
       37
        
           meson ninja pkg-config wayland scdoc

+8 -5

pkgs/applications/window-managers/sway/wrapper.nix

···

       4
       4
        
       , withBaseWrapper ? true, extraSessionCommands ? "", dbus

     

       5
       5
        
       , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3

     

       6
       6
        
       , extraOptions ? [] # E.g.: [ "--verbose" ]

     

       7
       7
       +
       # Used by the NixOS module:

     

       8
       8
       +
       , isNixOS ? false

     

       7
       9
        
       }:

     

       8
       10
        
       

     

       9
       11
        
       assert extraSessionCommands != "" -> withBaseWrapper;

     
···

       11
       13
        
       with lib;

     

       12
       14
        
       

     

       13
       15
        
       let

     

       16
       16
       +
         sway = sway-unwrapped.override { inherit isNixOS; };

     

       14
       17
        
         baseWrapper = writeShellScriptBin "sway" ''

     

       15
       18
        
            set -o errexit

     

       16
       19
        
            if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then

     
···

       20
       23
        
            fi

     

       21
       24
        
            if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then

     

       22
       25
        
              export DBUS_SESSION_BUS_ADDRESS

     

       23
       23
       -
              exec ${sway-unwrapped}/bin/sway "$@"

     

       26
       26
       +
              exec ${sway}/bin/sway "$@"

     

       24
       27
        
            else

     

       25
       25
       -
              exec ${dbus}/bin/dbus-run-session ${sway-unwrapped}/bin/sway "$@"

     

       28
       28
       +
              exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@"

     

       26
       29
        
            fi

     

       27
       30
        
          '';

     

       28
       31
        
       in symlinkJoin {

     

       29
       29
       -
         name = "sway-${sway-unwrapped.version}";

     

       32
       32
       +
         name = "sway-${sway.version}";

     

       30
       33
        
       

     

       31
       34
        
         paths = (optional withBaseWrapper baseWrapper)

     

       32
       32
       -
           ++ [ sway-unwrapped ];

     

       35
       35
       +
           ++ [ sway ];

     

       33
       36
        
       

     

       34
       37
        
         nativeBuildInputs = [ makeWrapper ]

     

       35
       38
        
           ++ (optional withGtkWrapper wrapGAppsHook);

     
···

       49
       52
        
       

     

       50
       53
        
         passthru.providedSessions = [ "sway" ];

     

       51
       54
        
       

     

       52
       52
       -
         inherit (sway-unwrapped) meta;

     

       55
       55
       +
         inherit (sway) meta;

     

       53
       56
        
       }