diff options
| author | Shea Levy <shea@shealevy.com> | 2016-08-15 19:01:44 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-08-15 19:01:44 -0400 |
| commit | 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1 (patch) | |
| tree | 73a214240d657ab03d4b52c3ba6c61f6538e030d /nixos/modules/hardware | |
| parent | 760b2b9048ea775c319cb348d74447a20dea513e (diff) | |
| parent | b067b5301104c7d09d86d69febaa423a49ce14c0 (diff) | |
| download | nixlib-57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1.tar nixlib-57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1.tar.gz nixlib-57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1.tar.bz2 nixlib-57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1.tar.lz nixlib-57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1.tar.xz nixlib-57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1.tar.zst nixlib-57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1.zip | |
Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs
Diffstat (limited to 'nixos/modules/hardware')
| -rw-r--r-- | nixos/modules/hardware/video/bumblebee.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/hardware/video/webcam/facetimehd.nix | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index b10846ac18a1..69db518ab21c 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -75,7 +75,6 @@ in serviceConfig = { ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; }; - environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; } diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index 2a2fcf3057d4..d311f600c319 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -36,7 +36,6 @@ in # and load it back on resume powerManagement.resumeCommands = '' - export MODULE_DIR=/run/current-system/kernel-modules/lib/modules ${pkgs.kmod}/bin/modprobe -v facetimehd ''; |