cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

systemd: use systemdLibs for packages that need udev

Browse source
This commit is contained in:
Julian Stecklina 2023-10-18 12:09:51 +02:00
parent 79f6045006
commit 856d0075a7
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/top-level/all-packages.nix
View file

@ -22061,8 +22061,6 @@ with pkgs;
hidapi = callPackage ../development/libraries/hidapi { hidapi = callPackage ../development/libraries/hidapi {
inherit (darwin.apple_sdk.frameworks) Cocoa IOKit; inherit (darwin.apple_sdk.frameworks) Cocoa IOKit;
# TODO: remove once `udev` is `systemdMinimal` everywhere.
udev = systemdMinimal;
}; };
highfive = callPackage ../development/libraries/highfive { }; highfive = callPackage ../development/libraries/highfive { };
@ -22766,9 +22764,7 @@ with pkgs;
libfakekey = callPackage ../development/libraries/libfakekey { }; libfakekey = callPackage ../development/libraries/libfakekey { };
libfido2 = callPackage ../development/libraries/libfido2 { libfido2 = callPackage ../development/libraries/libfido2 {};
udev = systemdMinimal;
};
libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla {
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices;
@ -23644,8 +23640,6 @@ with pkgs;
libusb1 = callPackage ../development/libraries/libusb1 { libusb1 = callPackage ../development/libraries/libusb1 {
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) IOKit Security; inherit (darwin.apple_sdk.frameworks) IOKit Security;
# TODO: remove once `udev` is `systemdMinimal` everywhere.
udev = systemdMinimal;
}; };
libusbgx = callPackage ../development/libraries/libusbgx { }; libusbgx = callPackage ../development/libraries/libusbgx { };
@ -28296,10 +28290,6 @@ with pkgs;
lsscsi = callPackage ../os-specific/linux/lsscsi { }; lsscsi = callPackage ../os-specific/linux/lsscsi { };
lvm2 = callPackage ../os-specific/linux/lvm2/2_03.nix { lvm2 = callPackage ../os-specific/linux/lvm2/2_03.nix {
# udev is the same package as systemd which depends on cryptsetup
# which depends on lvm2 again. But we only need the libudev part
# which does not depend on cryptsetup.
udev = systemdMinimal;
# break the cyclic dependency: # break the cyclic dependency:
# util-linux (non-minimal) depends (optionally, but on by default) on systemd, # util-linux (non-minimal) depends (optionally, but on by default) on systemd,
# systemd (optionally, but on by default) on cryptsetup and cryptsetup depends on lvm2 # systemd (optionally, but on by default) on cryptsetup and cryptsetup depends on lvm2
@ -28837,12 +28827,15 @@ with pkgs;
withUserDb = false; withUserDb = false;
withUkify = false; withUkify = false;
withBootloader = false; withBootloader = false;
onlyLibs = true; };
systemdLibs = systemdMinimal.override {
pname = "systemd-minimal-libs";
buildLibsOnly = true;
}; };
udev = udev =
if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero
else systemd; # TODO: change to systemdMinimal else systemdLibs;
systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; systemd-wait = callPackage ../os-specific/linux/systemd-wait { };