diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-07 16:29:26 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-09 10:34:49 +0000 |
| commit | 5e433b48dc48d56040baf87a603a8f0ac15e0f7a (patch) | |
| tree | d65005eb6f16dad464f63977f2a06ebf1d08fb54 /pkgs/misc/emulators | |
| parent | 13acfd0e28ddd2ad942d3b210e5bea4940b42aab (diff) | |
| download | nixlib-5e433b48dc48d56040baf87a603a8f0ac15e0f7a.tar nixlib-5e433b48dc48d56040baf87a603a8f0ac15e0f7a.tar.gz nixlib-5e433b48dc48d56040baf87a603a8f0ac15e0f7a.tar.bz2 nixlib-5e433b48dc48d56040baf87a603a8f0ac15e0f7a.tar.lz nixlib-5e433b48dc48d56040baf87a603a8f0ac15e0f7a.tar.xz nixlib-5e433b48dc48d56040baf87a603a8f0ac15e0f7a.tar.zst nixlib-5e433b48dc48d56040baf87a603a8f0ac15e0f7a.zip | |
retroarch: Don't use libGLU_combined
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/retroarch/cores.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index ced26333f4cd..9cc8a74c5d7e 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch -, alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL +, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, libGL , ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost }: @@ -152,7 +152,7 @@ in with stdenv.lib.licenses; buildPhase = "make"; name = "beetle-pce-fast-${der.version}"; }; - + beetle-pcfx = (mkLibRetroCore rec { core = "mednafen-pcfx"; src = fetchRetro { @@ -197,7 +197,7 @@ in with stdenv.lib.licenses; name = "beetle-saturn-${der.version}"; meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; }; - + beetle-supergrafx = (mkLibRetroCore rec { core = "mednafen-supergrafx"; src = fetchRetro { @@ -323,7 +323,7 @@ in with stdenv.lib.licenses; "-DENABLE_QT=OFF" "-DENABLE_LTO=OFF" "-DUSE_UPNP=OFF" - "-DUSE_DISCORD_PRESENCE=OFF" + "-DUSE_DISCORD_PRESENCE=OFF" ]; dontUseCmakeBuildDir = "yes"; buildPhase = "make"; @@ -380,7 +380,7 @@ in with stdenv.lib.licenses; }; description = "Flycast libretro port"; license = gpl2; - extraBuildInputs = [ libGLU_combined ]; + extraBuildInputs = [ libGL libGLU ]; }).override { makefile = "Makefile"; buildPhase = "make"; @@ -633,7 +633,7 @@ in with stdenv.lib.licenses; makefile = "libretro/Makefile"; buildPhase = "cd libretro && make"; }; - + o2em = (mkLibRetroCore rec { core = "o2em"; src = fetchRetro { @@ -647,7 +647,7 @@ in with stdenv.lib.licenses; makefile = "Makefile"; buildPhase = "make"; }; - + parallel-n64 = (mkLibRetroCore rec { core = "parallel-n64"; src = fetchRetro { @@ -677,7 +677,7 @@ in with stdenv.lib.licenses; configurePhase = "rm configure"; buildPhase = "make -f Makefile.libretro"; }; - + picodrive = (mkLibRetroCore rec { core = "picodrive"; src = fetchRetro { |