Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"

Was meant to go into staging, sorry This reverts commit 57b2d1e9b0, reversing changes made to 760b2b9048.
2016-08-15 19:05:52 -04:00
parent 57b2d1e9b0
commit 9adad8612b
39 changed files with 299 additions and 363 deletions
@@ -95,7 +95,8 @@ in
          LimitNPROC = 1048576;
        } // proxy_env;

-        path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
+        path = [ config.system.sbin.modprobe ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
+        environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";

        postStart = if cfg.socketActivation then "" else cfg.postStart;