diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-05 12:01:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 12:01:15 +0000 |
| commit | 2ecaf2263988aa95bceb0d871b2006582f3130b5 (patch) | |
| tree | ebf87b2d6e9b89734c4a380811be02fa1c51bcb7 /pkgs/os-specific/linux | |
| parent | 6607a943e1333f41a6f5b603ed9c7de7f028a3a0 (diff) | |
| parent | fa6f493ef0b3f6b6cbeb6948c30a8c3732bef03c (diff) | |
| download | nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.gz nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.bz2 nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.lz nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.xz nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.zst nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.zip | |
Merge master into staging-next
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"; }; } |