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/libva | |
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/libva')
-rw-r--r-- | pkgs/development/libraries/libva/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index ddc0d9e87df..6b8c3631fb3 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libXext, libdrm, libXfixes, wayland, libffi, libX11 -, mesa_noglu +, libGL , minimal ? true, libva }: @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; + ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them enableParallelBuilding = true; configureFlags = [ - "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" + "--with-drivers-path=${libGL.driverLink}/lib/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ |