commit 383b753bba523dc42aa6de9ea8b93b7ccfe75b65 · pyrox.dev/nixpkgs

+10 -4

nixos/modules/services/x11/desktop-managers/gnome.nix

···

       229
       229
        
               panelModulePackages = mkOption {

     

       230
       230
        
                 default = [ pkgs.gnome.gnome-applets ];

     

       231
       231
        
                 defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]";

     

       232
       232
       -
                 type = types.listOf types.path;

     

       232
       232
       +
                 type = types.listOf types.package;

     

       233
       233
        
                 description = lib.mdDoc ''

     

       234
       234
        
                   Packages containing modules that should be made available to `gnome-panel` (usually for applets).

     

       235
       235
        
       

     
···

       294
       294
        
                 map

     

       295
       295
        
                   (wm:

     

       296
       296
        
                     pkgs.gnome.gnome-flashback.mkSessionForWm {

     

       297
       297
       -
                       inherit (wm) wmName wmLabel wmCommand enableGnomePanel;

     

       298
       298
       -
                       inherit (cfg.flashback) panelModulePackages;

     

       297
       297
       +
                       inherit (wm) wmName wmLabel wmCommand;

     

       299
       298
        
                     }

     

       300
       299
        
                   ) flashbackWms;

     

       301
       300
        
       

     
···

       309
       308
        
       

     

       310
       309
        
             environment.systemPackages = with pkgs.gnome; [

     

       311
       310
        
               gnome-flashback

     

       312
       312
       -
             ];

     

       311
       311
       +
               (gnome-panel-with-modules.override {

     

       312
       312
       +
                 panelModulePackages = cfg.flashback.panelModulePackages;

     

       313
       313
       +
               })

     

       314
       314
       +
             ]

     

       315
       315
       +
             # For /share/applications/${wmName}.desktop

     

       316
       316
       +
             ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)

     

       317
       317
       +
             # For /share/gnome-session/sessions/gnome-flashback-${wmName}.session

     

       318
       318
       +
             ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);

     

       313
       319
        
           })

     

       314
       320
        
       

     

       315
       321
        
           (mkIf serviceCfg.core-os-services.enable {

+1 -8

nixos/tests/gnome-flashback.nix

···

       32
       32
        
           xauthority = "/run/user/${uid}/gdm/Xauthority";

     

       33
       33
        
         in ''

     

       34
       34
        
             with subtest("Login to GNOME Flashback with GDM"):

     

       35
       35
       -
                 # wait_for_x() checks graphical-session.target, which is expected to be

     

       36
       36
       -
                 # inactive on gnome-flashback before #228946 (i.e. systemd managed

     

       37
       37
       -
                 # gnome-session) is done.

     

       38
       38
       -
                 # https://github.com/NixOS/nixpkgs/pull/208060

     

       39
       39
       -
                 #

     

       40
       40
       -
                 # Previously this was unconditionally touched by xsessionWrapper but was

     

       41
       41
       -
                 # changed in #233981 (we have GNOME-Flashback:GNOME in XDG_CURRENT_DESKTOP).

     

       42
       42
       -
                 # machine.wait_for_x()

     

       35
       35
       +
                 machine.wait_for_x()

     

       43
       36
        
                 machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')

     

       44
       37
        
                 # Wait for alice to be logged in"

     

       45
       38
        
                 machine.wait_for_unit("default.target", "${user.name}")

+3 -3

pkgs/desktops/gnome/default.nix

···

       238
       238
        
       

     

       239
       239
        
         gnome-flashback = callPackage ./misc/gnome-flashback { };

     

       240
       240
        
       

     

       241
       241
       -
         gnome-panel = callPackage ./misc/gnome-panel {

     

       242
       242
       -
           autoreconfHook = pkgs.autoreconfHook269;

     

       243
       243
       -
         };

     

       241
       241
       +
         gnome-panel = callPackage ./misc/gnome-panel { };

     

       242
       242
       +
       

     

       243
       243
       +
         gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { };

     

       244
       244
        
       

     

       245
       245
        
         gnome-tweaks = callPackage ./misc/gnome-tweaks { };

     

       246
       246

+30 -66

pkgs/desktops/gnome/misc/gnome-flashback/default.nix

···

       127
       127
        
               versionPolicy = "odd-unstable";

     

       128
       128
        
             };

     

       129
       129
        
       

     

       130
       130
       -
             mkSessionForWm = { wmName, wmLabel, wmCommand, enableGnomePanel, panelModulePackages }:

     

       131
       131
       -
               let

     

       132
       132
       -
                 wmApplication = writeTextFile {

     

       133
       133
       -
                   name = "gnome-flashback-${wmName}-wm";

     

       134
       134
       -
                   destination = "/share/applications/${wmName}.desktop";

     

       135
       135
       -
                   text = ''

     

       136
       136
       -
                     [Desktop Entry]

     

       137
       137
       -
                     Type=Application

     

       138
       138
       -
                     Encoding=UTF-8

     

       139
       139
       -
                     Name=${wmLabel}

     

       140
       140
       -
                     Exec=${wmCommand}

     

       141
       141
       -
                     NoDisplay=true

     

       142
       142
       -
                     X-GNOME-WMName=${wmLabel}

     

       143
       143
       -
                     X-GNOME-Autostart-Phase=WindowManager

     

       144
       144
       -
                     X-GNOME-Provides=windowmanager

     

       145
       145
       -
                     X-GNOME-Autostart-Notify=false

     

       146
       146
       -
                   '';

     

       147
       147
       -
                 };

     

       148
       148
       -
       

     

       149
       149
       -
                 gnomeSession = writeTextFile {

     

       150
       150
       -
                   name = "gnome-flashback-${wmName}-gnome-session";

     

       151
       151
       -
                   destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";

     

       152
       152
       -
                   text = ''

     

       153
       153
       -
                     [GNOME Session]

     

       154
       154
       -
                     Name=GNOME Flashback (${wmLabel})

     

       155
       155
       -
                     ${requiredComponents wmName enableGnomePanel}

     

       156
       156
       -
                   '';

     

       157
       157
       -
                 };

     

       158
       158
       -
       

     

       159
       159
       -
                 # gnome-panel will only look for applets in a single directory so symlink them into here.

     

       160
       160
       -
                 panelModulesEnv = buildEnv {

     

       161
       161
       -
                   name = "gnome-panel-modules-env";

     

       162
       162
       -
                   # We always want to find the built-in panel applets.

     

       163
       163
       -
                   paths = [ gnome-panel gnome-flashback ] ++ panelModulePackages;

     

       164
       164
       -
                   pathsToLink = [ "/lib/gnome-panel/modules" ];

     

       165
       165
       -
                 };

     

       166
       166
       -
       

     

       167
       167
       -
                 executable = stdenv.mkDerivation {

     

       168
       168
       -
                   name = "gnome-flashback-${wmName}";

     

       169
       169
       -
                   nativeBuildInputs = [ glib wrapGAppsHook ];

     

       170
       170
       -
                   buildInputs = [ gnome-flashback ] ++ lib.optionals enableGnomePanel ([ gnome-panel ] ++ panelModulePackages);

     

       171
       171
       -
       

     

       172
       172
       -
                   # We want to use the wrapGAppsHook mechanism to wrap gnome-session

     

       173
       173
       -
                   # with the environment that gnome-flashback and gnome-panel need to

     

       174
       174
       -
                   # run, including the configured applet packages. This is only possible

     

       175
       175
       -
                   # in the fixup phase, so turn everything else off.

     

       176
       176
       -
                   dontUnpack = true;

     

       177
       177
       -
                   dontConfigure = true;

     

       178
       178
       -
                   dontBuild = true;

     

       179
       179
       -
                   dontInstall = true;

     

       180
       180
       -
                   dontWrapGApps = true; # We want to do the wrapping ourselves.

     

       130
       130
       +
             mkWmApplication = { wmName, wmLabel, wmCommand }:

     

       131
       131
       +
               writeTextFile {

     

       132
       132
       +
                 name = "gnome-flashback-${wmName}-wm";

     

       133
       133
       +
                 destination = "/share/applications/${wmName}.desktop";

     

       134
       134
       +
                 text = ''

     

       135
       135
       +
                   [Desktop Entry]

     

       136
       136
       +
                   Type=Application

     

       137
       137
       +
                   Encoding=UTF-8

     

       138
       138
       +
                   Name=${wmLabel}

     

       139
       139
       +
                   Exec=${wmCommand}

     

       140
       140
       +
                   NoDisplay=true

     

       141
       141
       +
                   X-GNOME-WMName=${wmLabel}

     

       142
       142
       +
                   X-GNOME-Autostart-Phase=WindowManager

     

       143
       143
       +
                   X-GNOME-Provides=windowmanager

     

       144
       144
       +
                   X-GNOME-Autostart-Notify=false

     

       145
       145
       +
                 '';

     

       146
       146
       +
               };

     

       181
       147
        
       

     

       182
       182
       -
                   # gnome-flashback and gnome-panel need to be added to XDG_DATA_DIRS so that their .desktop files can be found by gnome-session.

     

       183
       183
       -
                   # We need to pass the --builtin flag so that gnome-session invokes gnome-session-binary instead of systemd.

     

       184
       184
       -
                   # If systemd is used, it doesn't use the environment we set up here and so it can't find the .desktop files.

     

       185
       185
       -
                   preFixup = ''

     

       186
       186
       -
                     makeWrapper ${gnome-session}/bin/gnome-session $out \

     

       187
       187
       -
                       --add-flags "--session=gnome-flashback-${wmName} --builtin" \

     

       188
       188
       -
                       --set-default XDG_CURRENT_DESKTOP 'GNOME-Flashback:GNOME' \

     

       189
       189
       -
                       --prefix XDG_DATA_DIRS : '${lib.makeSearchPath "share" ([ wmApplication gnomeSession gnome-flashback ] ++ lib.optional enableGnomePanel gnome-panel)}' \

     

       190
       190
       -
                       "''${gappsWrapperArgs[@]}" \

     

       191
       191
       -
                       ${lib.optionalString enableGnomePanel "--set NIX_GNOME_PANEL_MODULESDIR '${panelModulesEnv}/lib/gnome-panel/modules'"}

     

       192
       192
       -
                   '';

     

       193
       193
       -
                 };

     

       148
       148
       +
             mkGnomeSession = { wmName, wmLabel, enableGnomePanel }:

     

       149
       149
       +
               writeTextFile {

     

       150
       150
       +
                 name = "gnome-flashback-${wmName}-gnome-session";

     

       151
       151
       +
                 destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";

     

       152
       152
       +
                 text = ''

     

       153
       153
       +
                   [GNOME Session]

     

       154
       154
       +
                   Name=GNOME Flashback (${wmLabel})

     

       155
       155
       +
                   ${requiredComponents wmName enableGnomePanel}

     

       156
       156
       +
                 '';

     

       157
       157
       +
               };

     

       194
       158
        
       

     

       195
       195
       -
               in

     

       159
       159
       +
             mkSessionForWm = { wmName, wmLabel, wmCommand }:

     

       196
       160
        
               writeTextFile

     

       197
       161
        
                 {

     

       198
       162
        
                   name = "gnome-flashback-${wmName}-xsession";

     
···

       201
       165
        
                     [Desktop Entry]

     

       202
       166
        
                     Name=GNOME Flashback (${wmLabel})

     

       203
       167
        
                     Comment=This session logs you into GNOME Flashback with ${wmLabel}

     

       204
       204
       -
                     Exec=${executable}

     

       168
       168
       +
                     Exec=${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName}

     

       205
       169
        
                     TryExec=${wmCommand}

     

       206
       170
        
                     Type=Application

     

       207
       171
        
                     DesktopNames=GNOME-Flashback;GNOME;

     
···

       211
       175
        
               };

     

       212
       176
        
       

     

       213
       177
        
             mkSystemdTargetForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }:

     

       214
       214
       -
               runCommand "gnome-flashback-${wmName}.target" {} ''

     

       178
       178
       +
               runCommand "gnome-flashback-${wmName}.target" { } ''

     

       215
       179
        
                 mkdir -p $out/lib/systemd/user

     

       216
       180
        
                 cp -r "${gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \

     

       217
       181
        
                   "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"

+66

pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , buildEnv

     

       4
       4
       +
       , gnome-panel

     

       5
       5
       +
       , gnome-flashback

     

       6
       6
       +
       , xorg

     

       7
       7
       +
       , glib

     

       8
       8
       +
       , wrapGAppsHook

     

       9
       9
       +
       , panelModulePackages ? [ ]

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       let

     

       13
       13
       +
         # We always want to find the built-in panel applets.

     

       14
       14
       +
         selectedPanelModulePackages = [ gnome-panel gnome-flashback ] ++ panelModulePackages;

     

       15
       15
       +
       

     

       16
       16
       +
         panelModulesEnv = buildEnv {

     

       17
       17
       +
           name = "gnome-panel-modules-env";

     

       18
       18
       +
           paths = selectedPanelModulePackages;

     

       19
       19
       +
           pathsToLink = [ "/lib/gnome-panel/modules" ];

     

       20
       20
       +
         };

     

       21
       21
       +
       in

     

       22
       22
       +
       stdenv.mkDerivation {

     

       23
       23
       +
         pname = "${gnome-panel.pname}-with-modules";

     

       24
       24
       +
         inherit (gnome-panel) version;

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           glib

     

       28
       28
       +
           wrapGAppsHook

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         buildInputs = selectedPanelModulePackages ++

     

       32
       32
       +
           lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]);

     

       33
       33
       +
       

     

       34
       34
       +
         dontUnpack = true;

     

       35
       35
       +
         dontConfigure = true;

     

       36
       36
       +
         dontBuild = true;

     

       37
       37
       +
       

     

       38
       38
       +
         preferLocalBuild = true;

     

       39
       39
       +
         allowSubstitutes = false;

     

       40
       40
       +
       

     

       41
       41
       +
         installPhase = ''

     

       42
       42
       +
           runHook preInstall

     

       43
       43
       +
       

     

       44
       44
       +
           mkdir -p $out

     

       45
       45
       +
           ${xorg.lndir}/bin/lndir -silent ${gnome-panel} $out

     

       46
       46
       +
       

     

       47
       47
       +
           rm -r $out/lib/gnome-panel/modules

     

       48
       48
       +
           ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out

     

       49
       49
       +
       

     

       50
       50
       +
           rm $out/share/applications/gnome-panel.desktop

     

       51
       51
       +
       

     

       52
       52
       +
           substitute ${gnome-panel}/share/applications/gnome-panel.desktop \

     

       53
       53
       +
             $out/share/applications/gnome-panel.desktop --replace \

     

       54
       54
       +
             "Exec=${gnome-panel}/bin/gnome-panel" "Exec=$out/bin/gnome-panel"

     

       55
       55
       +
       

     

       56
       56
       +
           runHook postInstall

     

       57
       57
       +
         '';

     

       58
       58
       +
       

     

       59
       59
       +
         preFixup = ''

     

       60
       60
       +
           gappsWrapperArgs+=(

     

       61
       61
       +
             --set NIX_GNOME_PANEL_MODULESDIR "$out/lib/gnome-panel/modules"

     

       62
       62
       +
           )

     

       63
       63
       +
         '';

     

       64
       64
       +
       

     

       65
       65
       +
         meta = gnome-panel.meta // { outputsToInstall = [ "out" ]; };

     

       66
       66
       +
       }