summary refs log tree commit diff
path: root/pkgs/os-specific/linux/wpa_supplicant
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2019-10-14 18:57:44 +0200
committerGitHub <noreply@github.com>2019-10-14 18:57:44 +0200
commit67effde499ffb60da484ebbbd643c6dc69f8eb77 (patch)
tree24264ffde03356200916068aac1fb5c6c3077227 /pkgs/os-specific/linux/wpa_supplicant
parent0fd1df74be43a6c07a64a2eb1587ab27c45be81b (diff)
downloadnixpkgs-67effde499ffb60da484ebbbd643c6dc69f8eb77.tar
nixpkgs-67effde499ffb60da484ebbbd643c6dc69f8eb77.tar.gz
nixpkgs-67effde499ffb60da484ebbbd643c6dc69f8eb77.tar.bz2
nixpkgs-67effde499ffb60da484ebbbd643c6dc69f8eb77.tar.lz
nixpkgs-67effde499ffb60da484ebbbd643c6dc69f8eb77.tar.xz
nixpkgs-67effde499ffb60da484ebbbd643c6dc69f8eb77.tar.zst
nixpkgs-67effde499ffb60da484ebbbd643c6dc69f8eb77.zip
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.
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
-rw-r--r--pkgs/os-specific/linux/wpa_supplicant/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index f54366201ff..81a9d36972a 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -85,11 +85,13 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/man/man5 $out/share/man/man8
     cp -v "doc/docbook/"*.5 $out/share/man/man5/
     cp -v "doc/docbook/"*.8 $out/share/man/man8/
-    mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
+
+    mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
     cp -v "dbus/"*service $out/share/dbus-1/system-services
     sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"*
     cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d
     cp -v "systemd/"*.service $out/etc/systemd/system
+
     rm $out/share/man/man8/wpa_priv.8
     install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example
   '';