about summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorDanielle Lancashire <dani@builds.terrible.systems>2020-11-06 15:01:43 +0100
committerDanielle Lancashire <dani@builds.terrible.systems>2020-11-06 15:01:43 +0100
commitf7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8 (patch)
tree4e99b11a11522855f815af02be035eb721bfd73f /pkgs/servers/x11
parentb06e65aad2b37485c0d48bb34e302aa0dbe8d6b4 (diff)
downloadnixlib-f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8.tar
nixlib-f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8.tar.gz
nixlib-f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8.tar.bz2
nixlib-f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8.tar.lz
nixlib-f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8.tar.xz
nixlib-f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8.tar.zst
nixlib-f7e691ac7e7cda4ef5b2f46e16b0d50a1ad2a4b8.zip
xorg.xf86videointel: Fix build
Since c2526545844bdbb8347f9d9169a77728bf2bdd73, building xf86videointel
has been broken on my system due to missing libXv. This commit
explicitly includes the dependency when building the package to
hopefully avoid things being broken for others.
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 96f40649c0f2..263ae993330b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1963,7 +1963,7 @@ lib.makeScope newScope (self: with self; {
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};
 
-  xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
+  xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC, libXv }: stdenv.mkDerivation {
     name = "xf86-video-intel-2.99.917";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1972,7 +1972,7 @@ lib.makeScope newScope (self: with self; {
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ];
+    buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC libXv ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) {};