Commit e1093690 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

gnome-panel: Move from gnome scope to top-level

parent 771f47b4

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

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ in 
          defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]";

          type = types.listOf types.package;

          description = ''

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

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



            If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`.

          '';
@@ -243,7 +243,7 @@ in 


      environment.systemPackages = with pkgs.gnome; [

        gnome-flashback

        (gnome-panel-with-modules.override {

        (pkgs.gnome-panel-with-modules.override {

          panelModulePackages = cfg.flashback.panelModulePackages;

        })

      ]

pkgs/applications/window-managers/xmonad/log-applet/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib

, desktopSupport ? "gnomeflashback", xorg

, gtk2

, gtk3, gnome, mate

, gtk3, gnome-panel, mate

, libxfce4util, xfce4-panel

}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec { 
  };



  buildInputs = [ glib dbus-glib xorg.xcbutilwm ]

    ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ]

    ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ]

    ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]

    ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]

  ;

pkgs/desktops/gnome/misc/gnome-panel/default.nix→pkgs/by-name/gn/gnome-panel/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { 
  passthru = {

    updateScript = gnome.updateScript {

      packageName = "gnome-panel";

      attrPath = "gnome.gnome-panel";

      versionPolicy = "odd-unstable";

    };

  };

pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix→pkgs/by-name/gn/gnome-panel/wrapper.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  lib,

  buildEnv,

  gnome,

  gnome-panel,

  xorg,

  glib,

  wrapGAppsHook3,
@@ -10,7 +11,7 @@ 
}:



let

  inherit (gnome) gnome-panel gnome-flashback;

  inherit (gnome) gnome-flashback;



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

  selectedPanelModulePackages = [