diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-05 01:19:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 01:19:20 -0500 |
| commit | 7c44617d22b47f69bf15b534a3dc8b5d3e78feef (patch) | |
| tree | 349cd5772e3da802c106f6e4ca08aa4240dd914a /pkgs/os-specific/linux | |
| parent | b425c7dbf9a4a2406c9dadc2e8946f3bf4cc70a4 (diff) | |
| parent | ca7dccc8a9968c442329d4668aebce00110bb376 (diff) | |
| download | nixpkgs-7c44617d22b47f69bf15b534a3dc8b5d3e78feef.tar nixpkgs-7c44617d22b47f69bf15b534a3dc8b5d3e78feef.tar.gz nixpkgs-7c44617d22b47f69bf15b534a3dc8b5d3e78feef.tar.bz2 nixpkgs-7c44617d22b47f69bf15b534a3dc8b5d3e78feef.tar.lz nixpkgs-7c44617d22b47f69bf15b534a3dc8b5d3e78feef.tar.xz nixpkgs-7c44617d22b47f69bf15b534a3dc8b5d3e78feef.tar.zst nixpkgs-7c44617d22b47f69bf15b534a3dc8b5d3e78feef.zip | |
Merge pull request #263402 from rowanG077/master
displaylink: Add aarch64 support
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/displaylink/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/evdi/default.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 463795936e7..e71062e8ac4 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -12,11 +12,11 @@ }: let - arch = - if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else if stdenv.hostPlatform.system == "i686-linux" then "x86" + bins = + if stdenv.hostPlatform.system == "x86_64-linux" then "x64-ubuntu-1604" + else if stdenv.hostPlatform.system == "i686-linux" then "x86-ubuntu-1604" + else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64-linux-gnu" else throw "Unsupported architecture"; - bins = "${arch}-ubuntu-1604"; libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ]; in @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://www.displaylink.com/"; license = licenses.unfree; maintainers = with maintainers; [ abbradar ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; hydraPlatforms = []; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index ebb6fbe2cc6..894ff5652bb 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ lgpl21Only gpl2Only ]; homepage = "https://www.displaylink.com/"; - broken = kernel.kernelOlder "4.19" || stdenv.isAarch64; + broken = kernel.kernelOlder "4.19"; }; } |