ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 00:27:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97794 from AndersonTorres/openmsx-upload

Browse Source 
openmsx: 0.15.0 -> 16.0
This commit is contained in:
Anderson Torres 2020-09-12 13:48:58 -03:00 committed by GitHub
commit 28f21171d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/misc/emulators/openmsx/custom-nixos.mk → pkgs/misc/emulators/openmsx/custom-nix.mk
View File

18
pkgs/misc/emulators/openmsx/default.nix
View File

@ -2,21 +2,19 @@
, python
, alsaLib, glew, libGL, libpng
, libogg, libtheora, libvorbis
, SDL, SDL_image, SDL_ttf
, SDL2, SDL2_image, SDL2_ttf
, freetype, tcl, zlib
}:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "openmsx";
version = "0.15.0";
version = "16.0";
src = fetchFromGitHub {
owner = "openMSX";
repo = "openMSX";
rev = "RELEASE_0_15_0";
sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l";
rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "04sphn9ph378r0qv881riv90cgz58650jcqcwmi1mv6gbcb3img5";
fetchSubmodules = true;
};
@ -24,10 +22,10 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib glew libGL libpng
libogg libtheora libvorbis freetype
SDL SDL_image SDL_ttf tcl zlib ];
SDL2 SDL2_image SDL2_ttf tcl zlib ];
postPatch = ''
cp ${./custom-nixos.mk} build/custom.mk
cp ${./custom-nix.mk} build/custom.mk
'';
dontAddPrefix = true;
@ -36,8 +34,8 @@ stdenv.mkDerivation rec {
# for providing support to Nixpkgs :)
TCL_CONFIG="${tcl}/lib/";
meta = {
description = "A MSX emulator";
meta = with stdenv.lib;{
description = "The MSX emulator that aims for perfection";
longDescription = ''
OpenMSX is an emulator for the MSX home computer system. Its goal is
to emulate all aspects of the MSX with 100% accuracy.

2
pkgs/top-level/all-packages.nix
View File

@ -27668,7 +27668,7 @@ in
snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { };
openmsx = callPackage ../misc/emulators/openmsx {
python = python27;
python = python3;
};
higan = callPackage ../misc/emulators/higan {