git.iko.soy/typeable/nixpkgs
on master help sign in
wpa_supplicant: install d-bus conf correctly to share/dbus/system.d

Fixes 40dda7383b4a2fe7d0012f90bd653f83d6b88737 which inadvertently installed to a file as the directory didn't exist. Also blocked up the postInstall script for readability.

commit67effde499ffb60da484ebbbd643c6dc69f8eb77 authorTor Hedin Brønner <torhedinbronner@gmail.com> dateMon 14 Oct 2019, 18:57 (7 years ago) parent0fd1df7
1 file changed+3−1
pkgs/os-specific/linux/wpa_supplicant/default.nix+3−1
pkgs/os-specific/linux/wpa_supplicant/default.nix+3−1
@@ -85,11 +85,13 @@ stdenv.mkDerivation rec {
8585 mkdir -p $out/share/man/man5 $out/share/man/man8
8686 cp -v "doc/docbook/"*.5 $out/share/man/man5/
8787 cp -v "doc/docbook/"*.8 $out/share/man/man8/
88− mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
88+
89+ mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
8990 cp -v "dbus/"*service $out/share/dbus-1/system-services
9091 sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"*
9192 cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d
9293 cp -v "systemd/"*.service $out/etc/systemd/system
94+
9395 rm $out/share/man/man8/wpa_priv.8
9496 install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example
9597 '';