From 3ebe5f802b7183b881514e6c92dee08004c687df Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Sep 2015 22:54:51 +0200 Subject: [PATCH] Remove references to /root/test-firmware This is no longer supported by systemd. --- nixos/modules/services/hardware/udev.nix | 4 +--- pkgs/os-specific/linux/kernel/common-config.nix | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 513eb27b4069..c747c24db67d 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -180,9 +180,7 @@ in firmware to function). If multiple packages contain firmware files with the same name, the first package in the list takes precedence. Note that you must rebuild your system if you add - files to any of these directories. For quick testing, - put firmware files in /root/test-firmware - and add that directory to the list. + files to any of these directories. ''; apply = list: pkgs.buildEnv { name = "firmware"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 386004dad43a..7b8a18613650 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -477,8 +477,7 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.17") "NFC? n"} - # Enable firmware loading via udev. Only needed for non-declarative - # firmware in /root/test-firmware. + # Enable firmware loading via udev (legacy). ${optionalString (versionAtLeast version "3.17") '' FW_LOADER_USER_HELPER_FALLBACK y ''}