mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
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.
This commit is contained in:
parent
c83a8e49d2
commit
5b2c57e316
|
@ -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";
|
|
@ -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 = ''
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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 { };
|
||||
|
|
Loading…
Reference in a new issue