diff options
Diffstat (limited to 'pkgs/os-specific/linux/displaylink')
-rw-r--r-- | pkgs/os-specific/linux/displaylink/99-displaylink.rules | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/displaylink/default.nix | 40 | ||||
-rw-r--r-- | pkgs/os-specific/linux/displaylink/udev-installer.patch | 18 |
3 files changed, 21 insertions, 38 deletions
diff --git a/pkgs/os-specific/linux/displaylink/99-displaylink.rules b/pkgs/os-specific/linux/displaylink/99-displaylink.rules new file mode 100644 index 00000000000..ceeb658a415 --- /dev/null +++ b/pkgs/os-specific/linux/displaylink/99-displaylink.rules @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="17e9", ATTR{bInterfaceClass}=="ff", ATTR{bInterfaceProtocol}=="03", TAG+="systemd", ENV{SYSTEMD_WANTS}="dlm.service" diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 3db9a7d3005..ca3e38c2e70 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -1,27 +1,36 @@ -{ stdenv, lib, unzip, utillinux, - libusb1, evdi, systemd, makeWrapper, requireFile, substituteAll }: - +{ stdenv +, lib +, unzip +, util-linux +, libusb1 +, evdi +, systemd +, makeWrapper +, requireFile +, substituteAll +}: let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else if stdenv.hostPlatform.system == "i686-linux" then "x86" else throw "Unsupported architecture"; bins = "${arch}-ubuntu-1604"; - libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 evdi ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.3.1.34"; + version = "5.4.0-55.153"; src = requireFile rec { name = "displaylink.zip"; - sha256 = "1c1kbjgpb71f73qnyl44rvwi6l4ivddq789rwvvh0ahw2jm324hy"; + sha256 = "1m2l3bnlfwfp94w7khr05npsbysg9mcyi7hi85n78xkd0xdcxml8"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.displaylink.com/downloads/file?id=1576 + https://www.synaptics.com/node/3751 Once you have downloaded the file, please use the following commands and re-run the installation: @@ -39,20 +48,11 @@ in stdenv.mkDerivation rec { ./displaylink-driver-${version}.run --target . --noexec --nodiskspace ''; - patches = [ (substituteAll { - src = ./udev-installer.patch; - inherit systemd; - })]; - installPhase = '' - sed -i "s,/opt/displaylink/udev.sh,$out/lib/udev/displaylink.sh,g" udev-installer.sh - ( source udev-installer.sh - mkdir -p $out/lib/udev/rules.d - main systemd "$out/lib/udev/rules.d/99-displaylink.rules" "$out/lib/udev/displaylink.sh" - ) - install -Dt $out/lib/displaylink *.spkg install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager + mkdir -p $out/lib/udev/rules.d + cp ${./99-displaylink.rules} $out/lib/udev/rules.d/99-displaylink.rules patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ --set-rpath ${libPath} \ @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; maintainers = with maintainers; [ nshalman abbradar peterhoeg eyjhb ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/displaylink/udev-installer.patch b/pkgs/os-specific/linux/displaylink/udev-installer.patch deleted file mode 100644 index 880c073fbcf..00000000000 --- a/pkgs/os-specific/linux/displaylink/udev-installer.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/udev-installer.sh 2018-12-09 12:05:53.772318942 +0100 -+++ b/udev-installer.sh 2018-12-09 12:06:19.939947629 +0100 -@@ -21,12 +21,12 @@ - cat <<'EOF' - start_service() - { -- systemctl start displaylink-driver -+ /run/current-system/systemd/bin/systemctl start --no-block dlm - } - - stop_service() - { -- systemctl stop displaylink-driver -+ /run/current-system/systemd/bin/systemctl stop dlm - } - - EOF - |