commit 1e6f4fb2bcb742b18bf526a945be18a0c0ecac07 · pyrox.dev/nixpkgs

+11 -5

nixos/modules/services/x11/desktop-managers/xfce4-14.nix

···

       53
       53
        
             glib # for gsettings

     

       54
       54
        
             gtk3.out # gtk-update-icon-cache

     

       55
       55
        
       

     

       56
       56
       +
             gnome3.gnome-themes-extra

     

       56
       57
        
             gnome3.adwaita-icon-theme

     

       57
       58
        
             hicolor-icon-theme

     

       58
       59
        
             tango-icon-theme

     
···

       69
       70
        
       

     

       70
       71
        
             exo

     

       71
       72
        
             garcon

     

       72
       72
       -
             gtk-xfce-engine

     

       73
       73
        
             libxfce4ui

     

       74
       74
        
             xfconf

     

       75
       75
        
       

     

       76
       76
        
             mousepad

     

       77
       77
       +
             parole

     

       77
       78
        
             ristretto

     

       78
       79
        
             xfce4-appfinder

     

       79
       80
        
             xfce4-screenshooter

     

       80
       81
        
             xfce4-session

     

       81
       82
        
             xfce4-settings

     

       83
       83
       +
             xfce4-taskmanager

     

       82
       84
        
             xfce4-terminal

     

       83
       85
        
       

     

       84
       86
        
             # TODO: resync patch for plugins

     
···

       86
       88
        
             thunar

     

       87
       89
        
           ] # TODO: NetworkManager doesn't belong here

     

       88
       90
        
             ++ optional config.networking.networkmanager.enable networkmanagerapplet

     

       89
       89
       -
             ++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin

     

       90
       91
        
             ++ optional config.powerManagement.enable xfce4-power-manager

     

       91
       91
       -
             ++ optional cfg.enableXfwm xfwm4

     

       92
       92
       -
             ++ optionals (!cfg.noDesktop) [

     

       93
       93
       -
               xfce4-panel

     

       92
       92
       +
             ++ optionals config.hardware.pulseaudio.enable [

     

       93
       93
       +
               pavucontrol

     

       94
       94
       +
               xfce4-pulseaudio-plugin

     

       95
       95
       +
             ] ++ optionals cfg.enableXfwm [

     

       96
       96
       +
               xfwm4

     

       97
       97
       +
               xfwm4-themes

     

       98
       98
       +
             ] ++ optionals (!cfg.noDesktop) [

     

       94
       99
        
               xfce4-notifyd

     

       100
       100
       +
               xfce4-panel

     

       95
       101
        
               xfdesktop

     

       96
       102
        
             ];

     

       97
       103

+2 -5

pkgs/desktops/xfce4-14/default.nix

···

       93
       93
        
       

     

       94
       94
        
         ## COMMON PARTS WITH XFCE 4.12

     

       95
       95
        
       

     

       96
       96
       -
         gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; };

     

       97
       97
       -
       

     

       98
       96
        
         xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { };

     

       99
       97
        
       

     

       100
       98
        
         xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { };

     
···

       113
       111
        
       

     

       114
       112
        
       

     

       115
       113
        
         ## ALIASES

     

       116
       116
       -
       

     

       117
       117
       -
         # added 2019-08-18

     

       118
       118
       -
         xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin";

     

       114
       114
       +
         xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18

     

       115
       115
       +
         gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17

     

       119
       116
        
       })

+1

pkgs/top-level/aliases.nix

···

       388
       388
        
         winusb = woeusb; # added 2017-12-22

     

       389
       389
        
         wireguard = wireguard-tools; # added 2018-05-19

     

       390
       390
        
         morituri = whipper; # added 2018-09-13

     

       391
       391
       +
         xfceUnstable = xfce4-14; # added 2019-09-17

     

       391
       392
        
         x11 = xlibsWrapper; # added 2015-09

     

       392
       393
        
         xbmc = kodi; # added 2018-04-25

     

       393
       394
        
         xbmcPlain = kodiPlain; # added 2018-04-25

-1

pkgs/top-level/all-packages.nix

···

       22709
       22709
        
         solarc-gtk-theme = callPackage ../misc/themes/solarc { };

     

       22710
       22710
        
       

     

       22711
       22711
        
         xfce = xfce4-12;

     

       22712
       22712
       -
         xfceUnstable = xfce4-14;

     

       22713
       22712
        
       

     

       22714
       22713
        
         xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });

     

       22715
       22714
        
         xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { });