kbd: split vlock into its own output

This avoids a dependency on pam when only the actual keyboard data is used.
This commit is contained in:
Linus Heckemann 2023-05-25 15:45:34 +02:00 committed by Cole Helbling
parent 74321e5a42
commit 6be63ce590
2 changed files with 11 additions and 1 deletions

View File

@ -32,6 +32,8 @@
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`.
- `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.
- `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be.

View File

@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-zN9FI4emOAlz0pJzY+nLuTn6IGiRWm+Tf/nSRSICRoM=";
};
outputs = [ "out" "dev" ];
# vlock is moved into its own output, since it depends on pam. This
# reduces closure size for most use cases.
outputs = [ "out" "vlock" "dev" ];
configureFlags = [
"--enable-optional-progs"
@ -55,6 +57,12 @@ stdenv.mkDerivation rec {
--replace 'bzip2 ' '${bzip2.bin}/bin/bzip2 ' \
--replace 'xz ' '${xz.bin}/bin/xz ' \
--replace 'zstd ' '${zstd.bin}/bin/zstd '
sed -i '
1i prefix:=$(vlock)
1i bindir := $(vlock)/bin' \
src/vlock/Makefile.in \
src/vlock/Makefile.am
'';
postInstall = ''