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

retroarch: Don't use libGLU_combined

Browse Source
This commit is contained in:
adisbladis 2019-11-07 16:29:26 +00:00
parent 13acfd0e28
commit 5e433b48dc
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/misc/emulators/retroarch/cores.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch { 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 , ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis
, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost }: , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost }:
@ -152,7 +152,7 @@ in with stdenv.lib.licenses;
buildPhase = "make"; buildPhase = "make";
name = "beetle-pce-fast-${der.version}"; name = "beetle-pce-fast-${der.version}";
}; };
beetle-pcfx = (mkLibRetroCore rec { beetle-pcfx = (mkLibRetroCore rec {
core = "mednafen-pcfx"; core = "mednafen-pcfx";
src = fetchRetro { src = fetchRetro {
@ -197,7 +197,7 @@ in with stdenv.lib.licenses;
name = "beetle-saturn-${der.version}"; name = "beetle-saturn-${der.version}";
meta.platforms = [ "x86_64-linux" "aarch64-linux" ]; meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
}; };
beetle-supergrafx = (mkLibRetroCore rec { beetle-supergrafx = (mkLibRetroCore rec {
core = "mednafen-supergrafx"; core = "mednafen-supergrafx";
src = fetchRetro { src = fetchRetro {
@ -323,7 +323,7 @@ in with stdenv.lib.licenses;
"-DENABLE_QT=OFF" "-DENABLE_QT=OFF"
"-DENABLE_LTO=OFF" "-DENABLE_LTO=OFF"
"-DUSE_UPNP=OFF" "-DUSE_UPNP=OFF"
"-DUSE_DISCORD_PRESENCE=OFF" "-DUSE_DISCORD_PRESENCE=OFF"
]; ];
dontUseCmakeBuildDir = "yes"; dontUseCmakeBuildDir = "yes";
buildPhase = "make"; buildPhase = "make";
@ -380,7 +380,7 @@ in with stdenv.lib.licenses;
}; };
description = "Flycast libretro port"; description = "Flycast libretro port";
license = gpl2; license = gpl2;
extraBuildInputs = [ libGLU_combined ]; extraBuildInputs = [ libGL libGLU ];
}).override { }).override {
makefile = "Makefile"; makefile = "Makefile";
buildPhase = "make"; buildPhase = "make";
@ -633,7 +633,7 @@ in with stdenv.lib.licenses;
makefile = "libretro/Makefile"; makefile = "libretro/Makefile";
buildPhase = "cd libretro && make"; buildPhase = "cd libretro && make";
}; };
o2em = (mkLibRetroCore rec { o2em = (mkLibRetroCore rec {
core = "o2em"; core = "o2em";
src = fetchRetro { src = fetchRetro {
@ -647,7 +647,7 @@ in with stdenv.lib.licenses;
makefile = "Makefile"; makefile = "Makefile";
buildPhase = "make"; buildPhase = "make";
}; };
parallel-n64 = (mkLibRetroCore rec { parallel-n64 = (mkLibRetroCore rec {
core = "parallel-n64"; core = "parallel-n64";
src = fetchRetro { src = fetchRetro {
@ -677,7 +677,7 @@ in with stdenv.lib.licenses;
configurePhase = "rm configure"; configurePhase = "rm configure";
buildPhase = "make -f Makefile.libretro"; buildPhase = "make -f Makefile.libretro";
}; };
picodrive = (mkLibRetroCore rec { picodrive = (mkLibRetroCore rec {
core = "picodrive"; core = "picodrive";
src = fetchRetro { src = fetchRetro {