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

libretro: Dont use libGLU_combined

Browse Source
This commit is contained in:
adisbladis 2019-11-07 20:31:41 +00:00
parent 01543a4843
commit 7668f680da
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

@ -276,7 +276,7 @@ in with stdenv.lib.licenses;
}; };
description = "libretro wrapper for desmume NDS emulator"; description = "libretro wrapper for desmume NDS emulator";
license = gpl2; license = gpl2;
extraBuildInputs = [ libpcap libGLU_combined xorg.libX11 ]; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
}).override { }).override {
makefile = "desmume/src/frontend/libretro/Makefile.libretro"; makefile = "desmume/src/frontend/libretro/Makefile.libretro";
configurePhase = "cd desmume/src/frontend/libretro"; configurePhase = "cd desmume/src/frontend/libretro";
@ -292,7 +292,7 @@ in with stdenv.lib.licenses;
}; };
description = "libretro wrapper for desmume NDS emulator from 2015"; description = "libretro wrapper for desmume NDS emulator from 2015";
license = gpl2; license = gpl2;
extraBuildInputs = [ libpcap libGLU_combined xorg.libX11 ]; extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
}).override { }).override {
makefile = "desmume/Makefile.libretro"; makefile = "desmume/Makefile.libretro";
configurePhase = "cd desmume"; configurePhase = "cd desmume";
@ -311,7 +311,7 @@ in with stdenv.lib.licenses;
broken = true; broken = true;
extraBuildInputs = [ extraBuildInputs = [
cmake curl libGLU_combined pcre pkgconfig sfml cmake curl libGLU libGL pcre pkgconfig sfml
gettext hidapi gettext hidapi
libevdev udev libevdev udev
] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]); ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]);
@ -478,7 +478,7 @@ in with stdenv.lib.licenses;
description = "Port of MAME to libretro"; description = "Port of MAME to libretro";
license = gpl2Plus; license = gpl2Plus;
extraBuildInputs = [ alsaLib libGLU_combined portaudio python27 xorg.libX11 ]; extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ];
}).override { }).override {
postPatch = '' postPatch = ''
# Prevent the failure during the parallel building of: # Prevent the failure during the parallel building of:
@ -614,7 +614,7 @@ in with stdenv.lib.licenses;
description = "Libretro port of Mupen64 Plus, GL only"; description = "Libretro port of Mupen64 Plus, GL only";
license = gpl2; license = gpl2;
extraBuildInputs = [ libGLU_combined libpng nasm xorg.libX11 ]; extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ];
}).override { }).override {
makefile = "Makefile"; makefile = "Makefile";
buildPhase = "make"; buildPhase = "make";
@ -658,7 +658,7 @@ in with stdenv.lib.licenses;
description = "Parallel Mupen64plus rewrite for libretro."; description = "Parallel Mupen64plus rewrite for libretro.";
license = gpl2; license = gpl2;
extraBuildInputs = [ libGLU_combined libpng ]; extraBuildInputs = [ libGLU libGL libpng ];
}).override { }).override {
makefile = "Makefile"; makefile = "Makefile";
buildPhase = "make"; buildPhase = "make";
@ -718,7 +718,7 @@ in with stdenv.lib.licenses;
}; };
description = "ppsspp libretro port"; description = "ppsspp libretro port";
license = gpl2; license = gpl2;
extraBuildInputs = [ cmake libGLU_combined ffmpeg python37 xorg.libX11 ]; extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ];
}).override { }).override {
cmakeFlags = "-DLIBRETRO=ON"; cmakeFlags = "-DLIBRETRO=ON";
makefile = "Makefile"; makefile = "Makefile";
@ -778,7 +778,7 @@ in with stdenv.lib.licenses;
}; };
description = "Libretro port of ScummVM"; description = "Libretro port of ScummVM";
license = gpl2; license = gpl2;
extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU_combined SDL ]; extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ];
}).override { }).override {
makefile = "backends/platform/libretro/build/Makefile"; makefile = "backends/platform/libretro/build/Makefile";
buildPhase = "cd backends/platform/libretro/build && make"; buildPhase = "cd backends/platform/libretro/build && make";