diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-03-10 14:41:34 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-03-10 20:38:13 +0000 |
| commit | 7079e744d4666db3af186899fe2fc0ef3cbeb842 (patch) | |
| tree | d65e951be75dab998ecd2e8337e1c30e7722e28c /pkgs/development/libraries/vaapi-intel | |
| parent | 4eec6bc9c9cafac55dbf774a2fd30da7e5a79cc4 (diff) | |
| parent | ddddca5c2fe1c93369404979ac194a1bc5d5fbaf (diff) | |
| download | nixpkgs-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar nixpkgs-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.gz nixpkgs-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.bz2 nixpkgs-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.lz nixpkgs-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.xz nixpkgs-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.zst nixpkgs-7079e744d4666db3af186899fe2fc0ef3cbeb842.zip | |
Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/development/libraries/vaapi-intel')
| -rw-r--r-- | pkgs/development/libraries/vaapi-intel/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 3f376dedbb7..4e729db4671 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 -, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext +, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; - buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ]; + buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]; enableParallelBuilding = true; |