diff options
author | Nikolay Amiantov <ab@fmap.me> | 2017-05-01 15:23:41 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2017-05-19 02:51:45 +0300 |
commit | e17744067a5d3460e06d531a93b2527757b20a55 (patch) | |
tree | e9282762d6a68ce392c004ca70eae54cd7deb86b /nixos/modules/hardware | |
parent | 8e7c7af3b88ca7df22e02f054f8fe07df52923f6 (diff) | |
download | nixlib-e17744067a5d3460e06d531a93b2527757b20a55.tar nixlib-e17744067a5d3460e06d531a93b2527757b20a55.tar.gz nixlib-e17744067a5d3460e06d531a93b2527757b20a55.tar.bz2 nixlib-e17744067a5d3460e06d531a93b2527757b20a55.tar.lz nixlib-e17744067a5d3460e06d531a93b2527757b20a55.tar.xz nixlib-e17744067a5d3460e06d531a93b2527757b20a55.tar.zst nixlib-e17744067a5d3460e06d531a93b2527757b20a55.zip |
displaylink: 1.1.62 -> 1.3.52
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r-- | nixos/modules/hardware/video/displaylink.nix | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/nixos/modules/hardware/video/displaylink.nix b/nixos/modules/hardware/video/displaylink.nix index 2a9382f39410..669ac849cbad 100644 --- a/nixos/modules/hardware/video/displaylink.nix +++ b/nixos/modules/hardware/video/displaylink.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -6,7 +6,11 @@ let enabled = elem "displaylink" config.services.xserver.videoDrivers; - displaylink = config.boot.kernelPackages.displaylink; + evdi = config.boot.kernelPackages.evdi; + + displaylink = pkgs.displaylink.override { + inherit evdi; + }; in @@ -14,15 +18,11 @@ in config = mkIf enabled { - boot.extraModulePackages = [ displaylink ]; - - boot.kernelModules = [ "evdi" ]; + boot.extraModulePackages = [ evdi ]; # Those are taken from displaylink-installer.sh and from Arch Linux AUR package. - services.udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess" - ''; + services.udev.packages = [ displaylink ]; powerManagement.powerDownCommands = '' #flush any bytes in pipe @@ -32,7 +32,10 @@ in echo "S" > /tmp/PmMessagesPort_in #wait until suspend of DisplayLinkManager finish - read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out + if [ -f /tmp/PmMessagesPort_out ]; then + #wait until suspend of DisplayLinkManager finish + read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out + fi ''; powerManagement.resumeCommands = '' @@ -40,10 +43,11 @@ in echo "R" > /tmp/PmMessagesPort_in ''; - systemd.services.displaylink = { + systemd.services.dlm = { description = "DisplayLink Manager Service"; after = [ "display-manager.service" ]; - wantedBy = [ "graphical.target" ]; + conflicts = [ "getty@tty7.service" ]; + path = [ pkgs.kmod ]; serviceConfig = { ExecStart = "${displaylink}/bin/DisplayLinkManager"; @@ -53,6 +57,7 @@ in preStart = '' mkdir -p /var/log/displaylink + modprobe evdi ''; }; |