Unverified Commit d6278c3a authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

xfce.*: Move to top-level (#473588)

parents 0d2a39bf ef9581e7

doc/hooks/xfce4-dev-tools.section.md

+1 −1
Original line number Diff line number Diff line 
# `xfce.xfce4-dev-tools` {#xfce4-dev-tools}

# `xfce4-dev-tools` {#xfce4-dev-tools}



This setup hook attempts to run `xdt-autogen` in `xdtAutogenPhase`, which is part of `preConfigurePhases`.

nixos/modules/programs/xfconf.nix

+2 −2
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ in 


  config = lib.mkIf cfg.enable {

    environment.systemPackages = [

      pkgs.xfce.xfconf

      pkgs.xfconf

    ];



    services.dbus.packages = [

      pkgs.xfce.xfconf

      pkgs.xfconf

    ];

  };

}

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

+4 −4
Original line number Diff line number Diff line
@@ -129,9 +129,9 @@ in 
        # Needed by Xfce's xinitrc script

        xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/



        xfce.exo

        xfce.garcon

        xfce.libxfce4ui

        xfce4-exo

        garcon

        libxfce4ui



        xfce.mousepad

        xfce.parole
@@ -160,7 +160,7 @@ in 
        xfce.xfwm4-themes

      ]

      ++ lib.optionals (!cfg.noDesktop) [

        xfce.xfce4-panel

        xfce4-panel

        xfce.xfdesktop

      ]

      ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver

pkgs/by-name/bu/budgie-desktop/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
  upower,

  vala,

  validatePkgConfig,

  xfce,

  libxfce4windowing,

  wrapGAppsHook3,

  zenity,

}:
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { 
    sassc

    udev

    upower

    xfce.libxfce4windowing

    libxfce4windowing

  ];



  propagatedBuildInputs = [

pkgs/by-name/bu/budgie-media-player-applet/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  ninja,

  nix-update-script,

  python3Packages,

  xfce,

  libxfce4windowing,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    glib

    gtk3

    xfce.libxfce4windowing

    libxfce4windowing

  ];



  pythonPath = with python3Packages; [