diff options
author | David McFarland <corngood@gmail.com> | 2017-01-29 19:02:48 -0400 |
---|---|---|
committer | David McFarland <corngood@gmail.com> | 2017-02-06 23:16:21 -0400 |
commit | 905627c7c5d25f6006ff3d757e8800958fc00e14 (patch) | |
tree | b28629217cf66af4fd98bb8587197afa8b127f06 /pkgs/servers/x11 | |
parent | 47c166fe0525e06ef833e15b9f543a0f3f342d7d (diff) | |
download | nixlib-905627c7c5d25f6006ff3d757e8800958fc00e14.tar nixlib-905627c7c5d25f6006ff3d757e8800958fc00e14.tar.gz nixlib-905627c7c5d25f6006ff3d757e8800958fc00e14.tar.bz2 nixlib-905627c7c5d25f6006ff3d757e8800958fc00e14.tar.lz nixlib-905627c7c5d25f6006ff3d757e8800958fc00e14.tar.xz nixlib-905627c7c5d25f6006ff3d757e8800958fc00e14.tar.zst nixlib-905627c7c5d25f6006ff3d757e8800958fc00e14.zip |
xorg-server: fglrxCompat -> abiCompat
Allows it to be used for fglrx (1.17) and amdgpu-pro (1.18)
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 889dd58c01bc..9c4225c7e5e9 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -393,10 +393,11 @@ in }; xorgserver = with xorg; attrs_passed: - # exchange attrs if fglrxCompat is set + # exchange attrs if abiCompat is set let - attrs = if !args.fglrxCompat then attrs_passed else - with args; { + attrs = with args; + if (args.abiCompat == null) then attrs_passed + else if (args.abiCompat == "1.17") then { name = "xorg-server-1.17.4"; builder = ./builder.sh; src = fetchurl { @@ -405,7 +406,16 @@ in }; buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }; + } else if (args.abiCompat == "1.18") then { + name = "xorg-server-1.18.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; + sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; + }; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + } else throw "unsupported xorg abiCompat: ${args.abiCompat}"; in attrs // (let |