Merge pull request #165873 from symphorien/rkjnsn-master

xfce4-screensaver: init at 4.16.0

Changed files
+62
nixos
doc
manual
from_md
release-notes
release-notes
modules
services
x11
desktop-managers
pkgs
desktops
xfce
applications
xfce4-screensaver
+7
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
···
</listitem>
<listitem>
<para>
+
<literal>services.xserver.desktopManager.xfce</literal> now
+
includes Xfce’s screen locker,
+
<literal>xfce4-screensaver</literal>.
+
</para>
+
</listitem>
+
<listitem>
+
<para>
The <literal>hadoop</literal> package has added support for
<literal>aarch64-linux</literal> and
<literal>aarch64-darwin</literal> as of 3.3.1
+2
nixos/doc/manual/release-notes/rl-2205.section.md
···
- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
+
- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver`.
+
- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
- The `R` package now builds again on `aarch64-darwin` ([#158992](https://github.com/NixOS/nixpkgs/pull/158992)).
+2
nixos/modules/services/x11/desktop-managers/xfce.nix
···
ristretto
xfce4-appfinder
xfce4-notifyd
+
xfce4-screensaver
xfce4-screenshooter
xfce4-session
xfce4-settings
···
xfce4-notifyd
];
+
security.pam.services.xfce4-screensaver.unixAuth = true;
};
}
+49
pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
···
+
{ mkXfceDerivation
+
, dbus-glib
+
, garcon
+
, glib
+
, gtk3
+
, libX11
+
, libXScrnSaver
+
, libXrandr
+
, libwnck
+
, libxfce4ui
+
, libxklavier
+
, pam
+
, systemd
+
, xfconf
+
, lib
+
}:
+
+
mkXfceDerivation {
+
category = "apps";
+
pname = "xfce4-screensaver";
+
version = "4.16.0";
+
+
sha256 = "1vblqhhzhv85yd5bz1xg14yli82ys5qrjdcabg3l53glbk61n99p";
+
+
buildInputs = [
+
dbus-glib
+
garcon
+
glib
+
gtk3
+
libX11
+
libXScrnSaver
+
libXrandr
+
libwnck
+
libxfce4ui
+
libxklavier
+
pam
+
systemd
+
xfconf
+
];
+
+
configureFlags = [ "--without-console-kit" ];
+
+
makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
+
+
meta = {
+
description = "Screensaver for Xfce";
+
maintainers = with lib.maintainers; [ symphorien ];
+
};
+
}
+2
pkgs/desktops/xfce/default.nix
···
xfce4-terminal = callPackage ./applications/xfce4-terminal { };
+
xfce4-screensaver = callPackage ./applications/xfce4-screensaver { };
+
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
inherit (pkgs.gnome) libsoup;
};