commit e17744067a5d3460e06d531a93b2527757b20a55 · pyrox.dev/nixpkgs

+16 -11

nixos/modules/hardware/video/displaylink.nix

···

       1
       1
       -
       { config, lib, ... }:

     

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       

     
···

       6
       6
        
       

     

       7
       7
        
         enabled = elem "displaylink" config.services.xserver.videoDrivers;

     

       8
       8
        
       

     

       9
       9
       -
         displaylink = config.boot.kernelPackages.displaylink;

     

       9
       9
       +
         evdi = config.boot.kernelPackages.evdi;

     

       10
       10
       +
       

     

       11
       11
       +
         displaylink = pkgs.displaylink.override {

     

       12
       12
       +
           inherit evdi;

     

       13
       13
       +
         };

     

       10
       14
        
       

     

       11
       15
        
       in

     

       12
       16
        
       

     
···

       14
       18
        
       

     

       15
       19
        
         config = mkIf enabled {

     

       16
       20
        
       

     

       17
       17
       -
           boot.extraModulePackages = [ displaylink ];

     

       18
       18
       -
       

     

       19
       19
       -
           boot.kernelModules = [ "evdi" ];

     

       21
       21
       +
           boot.extraModulePackages = [ evdi ];

     

       20
       22
        
       

     

       21
       23
        
           # Those are taken from displaylink-installer.sh and from Arch Linux AUR package.

     

       22
       24
        
       

     

       23
       23
       -
           services.udev.extraRules = ''

     

       24
       24
       -
             ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess"

     

       25
       25
       -
           '';

     

       25
       25
       +
           services.udev.packages = [ displaylink ];

     

       26
       26
        
       

     

       27
       27
        
           powerManagement.powerDownCommands = ''

     

       28
       28
        
             #flush any bytes in pipe

     
···

       32
       32
        
             echo "S" > /tmp/PmMessagesPort_in

     

       33
       33
        
       

     

       34
       34
        
             #wait until suspend of DisplayLinkManager finish

     

       35
       35
       -
             read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out

     

       35
       35
       +
             if [ -f /tmp/PmMessagesPort_out ]; then

     

       36
       36
       +
               #wait until suspend of DisplayLinkManager finish

     

       37
       37
       +
               read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out

     

       38
       38
       +
             fi

     

       36
       39
        
           '';

     

       37
       40
        
       

     

       38
       41
        
           powerManagement.resumeCommands = ''

     
···

       40
       43
        
             echo "R" > /tmp/PmMessagesPort_in

     

       41
       44
        
           '';

     

       42
       45
        
       

     

       43
       43
       -
           systemd.services.displaylink = {

     

       46
       46
       +
           systemd.services.dlm = {

     

       44
       47
        
             description = "DisplayLink Manager Service";

     

       45
       48
        
             after = [ "display-manager.service" ];

     

       46
       46
       -
             wantedBy = [ "graphical.target" ];

     

       49
       49
       +
             conflicts = [ "getty@tty7.service" ];

     

       50
       50
       +
             path = [ pkgs.kmod ];

     

       47
       51
        
       

     

       48
       52
        
             serviceConfig = {

     

       49
       53
        
               ExecStart = "${displaylink}/bin/DisplayLinkManager";

     
···

       53
       57
        
       

     

       54
       58
        
             preStart = ''

     

       55
       59
        
               mkdir -p /var/log/displaylink

     

       60
       60
       +
               modprobe evdi

     

       56
       61
        
             '';

     

       57
       62
        
           };

     

       58
       63

+22 -39

pkgs/os-specific/linux/displaylink/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchurl, fetchFromGitHub, unzip, kernel, utillinux, libdrm, libusb1, makeWrapper }:

     

       1
       1
       +
       { stdenv, lib, fetchurl, unzip, utillinux, libusb1, evdi, systemd, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         arch =

     

       5
       5
        
           if stdenv.system == "x86_64-linux" then "x64"

     

       6
       6
        
           else if stdenv.system == "i686-linux" then "x86"

     

       7
       7
        
           else throw "Unsupported architecture";

     

       8
       8
       -
         libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 ];

     

       8
       8
       +
         bins = "${arch}-ubuntu-1604";

     

       9
       9
       +
         libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ];

     

       9
       10
        
       

     

       10
       11
        
       in stdenv.mkDerivation rec {

     

       11
       12
        
         name = "displaylink-${version}";

     

       12
       12
       -
         version = "1.1.62";

     

       13
       13
       -
       

     

       14
       14
       -
         src = fetchFromGitHub {

     

       15
       15
       -
           owner = "DisplayLink";

     

       16
       16
       -
           repo = "evdi";

     

       17
       17
       -
           rev = "fe779940ff9fc7b512019619e24a5b22e4070f6a";

     

       18
       18
       -
           sha256 = "02hw83f6lscms8hssjzf30hl9zly3b28qcxwmxvnqwfhx1q491z9";

     

       19
       19
       -
         };

     

       13
       13
       +
         version = "1.3.52";

     

       20
       14
        
       

     

       21
       21
       -
         daemon = fetchurl {

     

       15
       15
       +
         src = fetchurl {

     

       22
       16
        
           name = "displaylink.zip";

     

       23
       23
       -
           url = "http://www.displaylink.com/downloads/file?id=607";

     

       24
       24
       -
           sha256 = "0jky3xk4dfzbzg386qya9l9952i4m8zhf55fdl06pi9r82k2iijx";

     

       17
       17
       +
           url = "http://www.displaylink.com/downloads/file?id=744";

     

       18
       18
       +
           sha256 = "0ridpsxcf761vym0nlpq702qa46ynddzci17bjmyax2pph7khr0k";

     

       25
       19
        
         };

     

       26
       20
        
       

     

       27
       21
        
         nativeBuildInputs = [ unzip makeWrapper ];

     

       28
       22
        
       

     

       29
       29
       -
         buildInputs = [ kernel libdrm ];

     

       30
       30
       -
       

     

       31
       23
        
         buildCommand = ''

     

       32
       32
       -
           unpackPhase

     

       33
       33
       -
           cd $sourceRoot

     

       34
       34
       -
           unzip $daemon

     

       24
       24
       +
           unzip $src

     

       35
       25
        
           chmod +x displaylink-driver-${version}.run

     

       36
       36
       -
           ./displaylink-driver-${version}.run --target daemon --noexec

     

       26
       26
       +
           ./displaylink-driver-${version}.run --target . --noexec

     

       37
       27
        
       

     

       38
       38
       -
           ( cd module

     

       39
       39
       -
             export makeFlags="$makeFlags KVER=${kernel.modDirVersion} KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

     

       40
       40
       -
             export hardeningDisable="pic format"

     

       41
       41
       -
             buildPhase

     

       42
       42
       -
             install -Dm755 evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko

     

       28
       28
       +
           sed -i "s,/opt/displaylink/udev.sh,$out/lib/udev/displaylink.sh,g" udev-installer.sh

     

       29
       29
       +
           ( source udev-installer.sh

     

       30
       30
       +
             mkdir -p $out/lib/udev/rules.d

     

       31
       31
       +
             main systemd "$out/lib/udev/rules.d/99-displaylink.rules" "$out/lib/udev/displaylink.sh"

     

       43
       32
        
           )

     

       33
       33
       +
           sed -i '2iPATH=${systemd}/bin:$PATH' $out/lib/udev/displaylink.sh

     

       44
       34
        
       

     

       45
       45
       -
           ( cd library

     

       46
       46
       -
             buildPhase

     

       47
       47
       -
             install -Dm755 libevdi.so $out/lib/libevdi.so

     

       48
       48
       -
           )

     

       35
       35
       +
           install -Dt $out/lib/displaylink *.spkg

     

       36
       36
       +
           install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager

     

       37
       37
       +
           patchelf \

     

       38
       38
       +
             --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \

     

       39
       39
       +
             --set-rpath ${libPath} \

     

       40
       40
       +
             $out/bin/DisplayLinkManager

     

       41
       41
       +
           wrapProgram $out/bin/DisplayLinkManager \

     

       42
       42
       +
             --run "cd $out/lib/displaylink"

     

       49
       43
        
       

     

       50
       44
        
           fixupPhase

     

       51
       51
       -
       

     

       52
       52
       -
           ( cd daemon

     

       53
       53
       -
             install -Dt $out/lib/displaylink *.spkg

     

       54
       54
       -
             install -Dm755 ${arch}/DisplayLinkManager $out/bin/DisplayLinkManager

     

       55
       55
       -
             patchelf \

     

       56
       56
       -
               --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \

     

       57
       57
       -
               --set-rpath $out/lib:${libPath} \

     

       58
       58
       -
               $out/bin/DisplayLinkManager

     

       59
       59
       -
             wrapProgram $out/bin/DisplayLinkManager \

     

       60
       60
       -
               --run "cd $out/lib/displaylink"

     

       61
       61
       -
           )

     

       62
       45
        
         '';

     

       63
       46
        
       

     

       64
       47
        
         meta = with stdenv.lib; {

+4 -2

pkgs/top-level/all-packages.nix

···

       11516
       11516
        
       

     

       11517
       11517
        
         disk_indicator = callPackage ../os-specific/linux/disk-indicator { };

     

       11518
       11518
        
       

     

       11519
       11519
       +
         displaylink = callPackage ../os-specific/linux/displaylink {

     

       11520
       11520
       +
           inherit (linuxPackages) evdi;

     

       11521
       11521
       +
         };

     

       11522
       11522
       +
       

     

       11519
       11523
        
         dmidecode = callPackage ../os-specific/linux/dmidecode { };

     

       11520
       11524
        
       

     

       11521
       11525
        
         dmtcp = callPackage ../os-specific/linux/dmtcp { };

     
···

       11877
       11881
        
           cryptodev = callPackage ../os-specific/linux/cryptodev { };

     

       11878
       11882
        
       

     

       11879
       11883
        
           cpupower = callPackage ../os-specific/linux/cpupower { };

     

       11880
       11880
       -
       

     

       11881
       11881
       -
           displaylink = callPackage ../os-specific/linux/displaylink { };

     

       11882
       11884
        
       

     

       11883
       11885
        
           dpdk = callPackage ../os-specific/linux/dpdk { };

     

       11884
       11886