From 5b2c57e316d52ee6278483ba65f77fb1808f3d5b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 24 Jun 2021 23:31:05 +0000 Subject: [PATCH 1/2] seatd: rename from libseat; build binary too "seatd" is the name of the upstream project, so it's the proper name for the package containing both the binary and the library. --- .../libseat => applications/misc/seatd}/default.nix | 13 +++++++------ pkgs/development/libraries/wlroots/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) rename pkgs/{development/libraries/libseat => applications/misc/seatd}/default.nix (76%) diff --git a/pkgs/development/libraries/libseat/default.nix b/pkgs/applications/misc/seatd/default.nix similarity index 76% rename from pkgs/development/libraries/libseat/default.nix rename to pkgs/applications/misc/seatd/default.nix index bdefb51b50f..62c613e1426 100644 --- a/pkgs/development/libraries/libseat/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -3,12 +3,13 @@ , meson , ninja , pkg-config +, scdoc , stdenv , systemd }: stdenv.mkDerivation rec { - pname = "libseat"; + pname = "seatd"; version = "0.5.0"; src = fetchFromSourcehut { @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + outputs = [ "bin" "out" "dev" "man" ]; - buildInputs = [ - systemd - ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; - mesonFlags = [ "-Dserver=disabled" "-Dseatd=disabled" "-Dlogind=enabled"]; + buildInputs = [ systemd ]; + + mesonFlags = [ "-Dlogind=enabled" ]; meta = with lib; { description = "A universal seat management library"; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index d0596de4439..45c2fd228f2 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, xwayland, libseat +, libpng, ffmpeg, xcbutilrenderutil, xwayland, seatd }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil xwayland libseat + libpng ffmpeg xcbutilrenderutil xwayland seatd ]; postFixup = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cc4d33024b0..5fada4b0766 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -409,6 +409,7 @@ mapAliases ({ libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 + libseat = seatd; # added 2021-06-24 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a005df9e60b..4d62071443b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16853,8 +16853,6 @@ in libsearpc = callPackage ../development/libraries/libsearpc { }; - libseat = callPackage ../development/libraries/libseat { }; - libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; @@ -26628,6 +26626,8 @@ in seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seatd = callPackage ../applications/misc/seatd { }; + secretscanner = callPackage ../tools/security/secretscanner { }; semiphemeral = callPackage ../tools/misc/semiphemeral { }; From d5bcba77a36f7266ee234fabddb6f828c681363c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 24 Jun 2021 23:34:47 +0000 Subject: [PATCH 2/2] seatd: enable embedded seatd backend for libseat This is the new mechanism for wlroots-based compositors to be able to run as root, with no logind or seatd running. --- pkgs/applications/misc/seatd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index 62c613e1426..e07356d0c33 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ systemd ]; - mesonFlags = [ "-Dlogind=enabled" ]; + mesonFlags = [ "-Dlogind=enabled" "-Dbuiltin=enabled" ]; meta = with lib; { description = "A universal seat management library";