public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retroarch: add wayland dependency and fix cross

Browse Source 
- Need custom pkg-config setting
- add wayland & libxkbcommon
This commit is contained in:
Matthew Bauer 2020-03-10 22:54:31 -04:00
parent 357a5c6472
commit 7d278d7e33
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/misc/emulators/retroarch/default.nix
View File

@ -15,6 +15,8 @@
, enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
, withVulkan ? stdenv.isLinux, vulkan-loader ? null , withVulkan ? stdenv.isLinux, vulkan-loader ? null
, fetchurl , fetchurl
, wayland
, libxkbcommon
}: }:
with stdenv.lib; with stdenv.lib;
@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
}; };
nativeBuildInputs = [ pkgconfig ] nativeBuildInputs = [ pkgconfig wayland ]
++ optional withVulkan makeWrapper; ++ optional withVulkan makeWrapper;
buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ]
@ -38,7 +40,11 @@ stdenv.mkDerivation rec {
++ optional withVulkan vulkan-loader ++ optional withVulkan vulkan-loader
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm mesa udev ]; libXdmcp libXext libXxf86vm mesa udev
wayland libxkbcommon ];
# we use prefix-less pkg-config
PKG_CONF_PATH = "pkg-config";
enableParallelBuilding = true; enableParallelBuilding = true;