Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0fd1df74be43
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 67effde499ff
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 14, 2019

  1. wpa_supplicant: install d-bus conf correctly to share/dbus/system.d 

    Fixes 40dda73 which inadvertently installed to
a file as the directory didn't exist.

Also blocked up the postInstall script for readability.
    @hedning
    hedning authored Oct 14, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    shuding Shu Ding
    GPG key ID: 899520937F032E83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    67effde View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/os-specific/linux/wpa_supplicant/default.nix
4 changes: 3 additions & 1 deletion pkgs/os-specific/linux/wpa_supplicant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
'';