diff options
author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/services/networking.scm | |
parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
download | guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/services/networking.scm')
-rw-r--r-- | gnu/services/networking.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index b78c8ceacc..87b3d754a3 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1591,7 +1591,8 @@ extra-settings "\n")))) (requirement `(user-processes ,@requirement)) (documentation "Run the hostapd WiFi access point daemon.") (start #~(make-forkexec-constructor - (list #$(file-append hostapd "/sbin/hostapd") + (list #$(file-append (hostapd-configuration-package config) + "/sbin/hostapd") #$(hostapd-configuration-file config)) #:log-file "/var/log/hostapd.log")) (stop #~(make-kill-destructor))))) |