diff options
author | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
commit | 9adad8612b082bcbae30c81678a04b79a44079a4 (patch) | |
tree | 6814d056ee2960d122842dc9c830bb411c40d5ff /nixos/modules/hardware/video | |
parent | 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1 (diff) | |
download | nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.gz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.bz2 nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.lz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.xz nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.zst nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.zip |
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
Diffstat (limited to 'nixos/modules/hardware/video')
-rw-r--r-- | nixos/modules/hardware/video/bumblebee.nix | 1 | ||||
-rw-r--r-- | nixos/modules/hardware/video/webcam/facetimehd.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 69db518ab21..b10846ac18a 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -75,6 +75,7 @@ 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 d311f600c31..2a2fcf3057d 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -36,6 +36,7 @@ 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 ''; |