Unverified Commit 6d7f9a3a authored by Bobby Rong's avatar Bobby Rong
Browse files

libxfce4windowing: Move to top-level

parent e78d67ce
Loading
Loading
Loading
Loading
+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 = [
+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; [
+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ makeScopeWithSplicing' {

      garcon = callPackage ./core/garcon { };

      libxfce4windowing = callPackage ./core/libxfce4windowing { };

      thunar-unwrapped = callPackage ./core/thunar { };

      thunar = callPackage ./core/thunar/wrapper.nix { };
@@ -171,6 +169,7 @@ makeScopeWithSplicing' {
  exo = lib.warnOnInstantiate "‘xfce.exo’ was moved to top-level. Please use ‘pkgs.xfce4-exo’ directly" pkgs.xfce4-exo; # Added on 2025-12-23
  libxfce4ui = lib.warnOnInstantiate "‘xfce.libxfce4ui’ was moved to top-level. Please use ‘pkgs.libxfce4ui’ directly" pkgs.libxfce4ui; # Added on 2025-12-23
  libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
  libxfce4windowing = lib.warnOnInstantiate "‘xfce.libxfce4windowing’ was moved to top-level. Please use ‘pkgs.libxfce4windowing’ directly" pkgs.libxfce4windowing; # Added on 2025-12-23
  xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
  xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23
}