summary refs log tree commit diff
path: root/pkgs/os-specific/linux/wpa_supplicant
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2013-01-04 21:00:53 +0100
committerPeter Simons <simons@cryp.to>2013-01-04 21:00:53 +0100
commit9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2 (patch)
tree366107df9c9c85749c9c601ba6a9115f7714badd /pkgs/os-specific/linux/wpa_supplicant
parent7505cb5f9a3e92b864f36f1f52ee63caaa8b40af (diff)
parent440bc6ec2a17697b379a637b9e84a274bec3a719 (diff)
downloadnixpkgs-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar
nixpkgs-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.gz
nixpkgs-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.bz2
nixpkgs-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.lz
nixpkgs-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.xz
nixpkgs-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.zst
nixpkgs-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.zip
Merge branch 'master' into stdenv-updates.
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
-rw-r--r--pkgs/os-specific/linux/wpa_supplicant/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index c6846b8fd13..a69c5646d74 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }:
 
 stdenv.mkDerivation rec {
-  version = "1.0";
+  version = "1.1";
 
   name = "wpa_supplicant-${version}";
 
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
-    sha256 = "171b9027rbzy64zaal4832ix9i3mm6ypwmynbpia5bss793ivm4i";
+    sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5";
   };
 
   preBuild = ''
@@ -38,10 +38,11 @@ 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
+    mkdir -p $out/etc/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/etc/dbus-1/system.d
+    cp -v systemd/*.service $out/etc/systemd/system
   ''; # */
 
   meta = {