From a7157fa2f0d8840ddfa946d63bffa23d7a80d43e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 30 Oct 2015 10:29:56 -0400 Subject: [PATCH] Remove firmware loader fallback. Systemd dropped support in 207 (would be nice if configure failed with a bad flag), so all this does is add an annoying delay if firmware can't be found by the kernel --- pkgs/os-specific/linux/kernel/common-config.nix | 5 ----- pkgs/os-specific/linux/systemd/default.nix | 1 - 2 files changed, 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 62138fb58ab..02f2672fa23 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -478,11 +478,6 @@ with stdenv.lib; ''} ZRAM m - # Enable firmware loading via udev (legacy). - ${optionalString (versionAtLeast version "3.17") '' - FW_LOADER_USER_HELPER_FALLBACK y - ''} - # Enable PCIe and USB for the brcmfmac driver BRCMFMAC_USB? y BRCMFMAC_PCIE? y diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index b7f70ec3b11..5e458693799 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d" "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services" "--with-dbussessionservicedir=$(out)/share/dbus-1/services" - "--with-firmware-path=/root/test-firmware:/run/current-system/firmware" "--with-tty-gid=3" # tty in NixOS has gid 3 "--enable-compat-libs" # get rid of this eventually "--disable-tests"