diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-19 12:40:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-19 12:40:03 -0500 |
commit | ce01740daeaf1288cc973942d80ed8bf69e9d1d1 (patch) | |
tree | 09af5176df893616b2297a47899ee476a46114c4 /pkgs/servers/x11/xorg | |
parent | ce456559d790b2d1c0e9145193caab550903c7da (diff) | |
parent | ebf1dade82911ad4e0d88cf09ad4feb5819549d5 (diff) | |
download | nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.gz nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.bz2 nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.lz nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.xz nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.tar.zst nixlib-ce01740daeaf1288cc973942d80ed8bf69e9d1d1.zip |
Merge pull request #33685 from corngood/amdgpu-pro-upgrade
amdgpu-pro: 17.10 -> 17.40
Diffstat (limited to 'pkgs/servers/x11/xorg')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 18189ba2e68d..13fbf7b6791f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -429,8 +429,9 @@ in xorgserver = with xorg; attrs_passed: # exchange attrs if abiCompat is set let + version = (builtins.parseDrvName attrs_passed.name).version; attrs = with args; - if (args.abiCompat == null) then attrs_passed + if (args.abiCompat == null || lib.hasPrefix args.abiCompat version) then attrs_passed else if (args.abiCompat == "1.17") then { name = "xorg-server-1.17.4"; builder = ./builder.sh; @@ -452,7 +453,7 @@ in buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; postPatch = "sed '1i#include <malloc.h>' -i include/os.h"; meta.platforms = stdenv.lib.platforms.unix; - } else throw "unsupported xorg abiCompat: ${args.abiCompat}"; + } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}"; in attrs // (let |