diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-21 11:28:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-21 11:32:26 +0200 |
| commit | ab95a3ff7fdef556e35508677e5d104224be041a (patch) | |
| tree | a679a392a7117f4be684c8de9dee0c613bb6376a /pkgs/servers/x11 | |
| parent | 6522715429adae6966b7ca83fdf0e6dfe83367b6 (diff) | |
| download | nixlib-ab95a3ff7fdef556e35508677e5d104224be041a.tar nixlib-ab95a3ff7fdef556e35508677e5d104224be041a.tar.gz nixlib-ab95a3ff7fdef556e35508677e5d104224be041a.tar.bz2 nixlib-ab95a3ff7fdef556e35508677e5d104224be041a.tar.lz nixlib-ab95a3ff7fdef556e35508677e5d104224be041a.tar.xz nixlib-ab95a3ff7fdef556e35508677e5d104224be041a.tar.zst nixlib-ab95a3ff7fdef556e35508677e5d104224be041a.zip | |
xorg xf86-video-amdgpu: init at 1.1.0
Fixes #17682, closes #17857. The resulting binary is the same as in the PR, but this uses auto-generated expression with override.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4a2ac2469d82..da74fcb4ca6d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1678,6 +1678,17 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; + xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { + name = "xf86-video-amdgpu-1.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2; + sha256 = "0cbrqpmi1hgbsi0i93v0yp7lv3wf4s0vbdlrj19cxmglv7gd1xb9"; + }; + buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + xf86videoark = (mkDerivation "xf86videoark" { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c6f28bcb645c..ebd09e3096ee 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -323,6 +323,10 @@ in ]; }; + xf86videoamdgpu = attrs: attrs // { + configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ]; + }; + xf86videoati = attrs: attrs // { NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver}/include/xorg"; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 3dae9846335d..8a512144fdce 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -127,6 +127,7 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2 |