Unverified Commit f9fe536c authored by Guillaume Girol's avatar Guillaume Girol Committed by GitHub
Browse files

Merge pull request #165873 from symphorien/rkjnsn-master 

xfce4-screensaver: init at 4.16.0
parents 536df679 e0d0ff64

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

+7 −0
Original line number Diff line number Diff line
@@ -1780,6 +1780,13 @@ 
          desktop environments as needed.

        </para>

      </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

nixos/doc/manual/release-notes/rl-2205.section.md

+2 −0
Original line number Diff line number Diff line
@@ -615,6 +615,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- 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)).

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

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ in 
      ristretto

      xfce4-appfinder

      xfce4-notifyd

      xfce4-screensaver

      xfce4-screenshooter

      xfce4-session

      xfce4-settings
@@ -168,5 +169,6 @@ in 
      xfce4-notifyd

    ];



    security.pam.services.xfce4-screensaver.unixAuth = true;

  };

}

pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix

0 → 100644
+49 −0
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/desktops/xfce/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ lib.makeScope pkgs.newScope (self: with self; { 


  xfce4-terminal = callPackage ./applications/xfce4-terminal { };



  xfce4-screensaver = callPackage ./applications/xfce4-screensaver { };



  xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {

    inherit (pkgs.gnome) libsoup;

  };