diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-10 22:54:31 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-05 21:37:45 -0400 |
| commit | 7d278d7e33dfe8f9f8dbe690648b06916e2f55a4 (patch) | |
| tree | f501ad54742092ac232ff89c40f12f46b5e6f106 /pkgs/misc/emulators | |
| parent | 357a5c6472a8aa8c83b5246662688b7f1e77fcd9 (diff) | |
| download | nixlib-7d278d7e33dfe8f9f8dbe690648b06916e2f55a4.tar nixlib-7d278d7e33dfe8f9f8dbe690648b06916e2f55a4.tar.gz nixlib-7d278d7e33dfe8f9f8dbe690648b06916e2f55a4.tar.bz2 nixlib-7d278d7e33dfe8f9f8dbe690648b06916e2f55a4.tar.lz nixlib-7d278d7e33dfe8f9f8dbe690648b06916e2f55a4.tar.xz nixlib-7d278d7e33dfe8f9f8dbe690648b06916e2f55a4.tar.zst nixlib-7d278d7e33dfe8f9f8dbe690648b06916e2f55a4.zip | |
retroarch: add wayland dependency and fix cross
- Need custom pkg-config setting - add wayland & libxkbcommon
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/retroarch/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 02d098654321..812b9eabc5a4 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -15,6 +15,8 @@ , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null , withVulkan ? stdenv.isLinux, vulkan-loader ? null , fetchurl +, wayland +, libxkbcommon }: with stdenv.lib; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig wayland ] ++ optional withVulkan makeWrapper; buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] @@ -38,7 +40,11 @@ stdenv.mkDerivation rec { ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ 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; |