public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30872 from FRidh/udev

Browse Source 
systemd: remove udev attributes
This commit is contained in:
Frederik Rietdijk 2017-11-04 10:02:01 +01:00 committed by GitHub
commit decaeb3040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/misc/drivers/foo2zjs/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"PIXMAPS=$(out)/share/pixmaps" "PIXMAPS=$(out)/share/pixmaps"
"UDEVBIN=$(out)/bin" "UDEVBIN=$(out)/bin"
"UDEVDIR=$(out)/etc/udev/rules.d" "UDEVDIR=$(out)/etc/udev/rules.d"
"UDEVD=${systemd.udev.bin}/sbin/udevd" "UDEVD=${systemd}/sbin/udevd"
"LIBUDEVDIR=$(out)/lib/udev/rules.d" "LIBUDEVDIR=$(out)/lib/udev/rules.d"
"USBDIR=$(out)/etc/hotplug/usb" "USBDIR=$(out)/etc/hotplug/usb"
"FOODB=$(out)/share/foomatic/db/source" "FOODB=$(out)/share/foomatic/db/source"

2
pkgs/os-specific/linux/lvm2/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation {
preConfigure = preConfigure =
'' ''
substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
--replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm --replace /usr/bin/udevadm ${systemd}/bin/udevadm
sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_SYS_DIR/d Makefile.in
sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in

6
pkgs/top-level/all-packages.nix
View File

@ -12975,11 +12975,7 @@ with pkgs;
systemd = callPackage ../os-specific/linux/systemd { systemd = callPackage ../os-specific/linux/systemd {
utillinux = utillinuxMinimal; # break the cyclic dependency utillinux = utillinuxMinimal; # break the cyclic dependency
} };
// {
udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm
udev.lib = libudev.out; # ${systemd.udev.lib}/lib/libudev.*
};
# standalone cryptsetup generator for systemd # standalone cryptsetup generator for systemd
systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { };