diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-13 16:48:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 16:48:38 -0400 |
| commit | e520d6af29158ff6d17c34ec16b1f2e79bccad45 (patch) | |
| tree | ddf031dda697cba7549ed8357ca3454c30433fbd /pkgs/development/libraries/libva | |
| parent | 940c35568bc2fa135eafe0817027c765d9840469 (diff) | |
| parent | c6ff360cc437d366c10f2f827edd5a7fb47e73c3 (diff) | |
| download | nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.gz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.bz2 nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.lz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.xz nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.zst nixpkgs-e520d6af29158ff6d17c34ec16b1f2e79bccad45.zip | |
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
Diffstat (limited to 'pkgs/development/libraries/libva')
| -rw-r--r-- | pkgs/development/libraries/libva/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 1c8e78a3a37..be374eaf895 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -2,6 +2,7 @@ , libXext, libdrm, libXfixes, wayland, libffi, libX11 , libGL, mesa , minimal ? false, libva-minimal +, buildPackages }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wayland ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ # Add FHS paths for non-NixOS applications. "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + "ac_cv_path_WAYLAND_SCANNER=${buildPackages.wayland}/bin/wayland-scanner" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ |