Merge pull request #29863 from yegortimoshenko/mednafen/0.9.48

mednafen: 0.9.47 -> 0.9.48, disable PIC, unversioned docs
This commit is contained in:
Orivej Desh 2017-10-05 21:42:04 +00:00 committed by GitHub
commit da20916efa
2 changed files with 28 additions and 26 deletions

View File

@ -1,36 +1,42 @@
{ stdenv, fetchurl, pkgconfig
, libX11, mesa, freeglut
, libjack2, libcdio, libsndfile, libsamplerate
, SDL, SDL_net, zlib
}:
{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2
, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "mednafen-${version}";
version = "0.9.47";
version = "0.9.48";
src = fetchurl {
url = "https://mednafen.github.io/releases/files/${name}.tar.xz";
sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si";
sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k";
};
buildInputs =
[ pkgconfig libX11 mesa freeglut libjack2 libcdio
libsndfile libsamplerate SDL SDL_net zlib ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
freeglut
mesa
libcdio
libjack2
libsamplerate
libsndfile
libX11
SDL
SDL_net
zlib
];
hardeningDisable = [ "pic" ];
# Install docs
postInstall = ''
mkdir -p $out/share/doc/$name
cd Documentation
install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt
mkdir -p $out/share/doc
mv Documentation $out/share/doc/mednafen
'';
meta = with stdenv.lib; {
description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
homepage = http://mednafen.github.io/;
homepage = https://mednafen.github.io/;
license = licenses.gpl2;
maintainers = [ maintainers.AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}

View File

@ -1,25 +1,21 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "mednafen-server-${version}";
version = "0.5.2";
src = fetchurl {
url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz";
url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz";
sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq";
};
postInstall = ''
mkdir -p $out/share/$name
install -m 644 -t $out/share/$name standard.conf
'';
postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf";
meta = with stdenv.lib; {
description = "Netplay server for Mednafen";
homepage = http://mednafen.github.io/;
homepage = https://mednafen.github.io/;
license = licenses.gpl2;
maintainers = [ maintainers.AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}