Merge pull request #29863 from yegortimoshenko/mednafen/0.9.48

mednafen: 0.9.47 -> 0.9.48, disable PIC, unversioned docs

authored by Orivej Desh and committed by GitHub da20916e 3bd24be7

+28 -26
+24 -18
pkgs/misc/emulators/mednafen/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig 2 - , libX11, mesa, freeglut 3 - , libjack2, libcdio, libsndfile, libsamplerate 4 - , SDL, SDL_net, zlib 5 - }: 1 + { stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2 2 + , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: 6 3 7 - with stdenv.lib; 8 4 stdenv.mkDerivation rec { 9 - 10 5 name = "mednafen-${version}"; 11 - version = "0.9.47"; 6 + version = "0.9.48"; 12 7 13 8 src = fetchurl { 14 9 url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; 15 - sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si"; 10 + sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; 16 11 }; 17 12 18 - buildInputs = 19 - [ pkgconfig libX11 mesa freeglut libjack2 libcdio 20 - libsndfile libsamplerate SDL SDL_net zlib ]; 13 + nativeBuildInputs = [ pkgconfig ]; 21 14 22 - # Install docs 15 + buildInputs = [ 16 + freeglut 17 + mesa 18 + libcdio 19 + libjack2 20 + libsamplerate 21 + libsndfile 22 + libX11 23 + SDL 24 + SDL_net 25 + zlib 26 + ]; 27 + 28 + hardeningDisable = [ "pic" ]; 29 + 23 30 postInstall = '' 24 - mkdir -p $out/share/doc/$name 25 - cd Documentation 26 - install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt 31 + mkdir -p $out/share/doc 32 + mv Documentation $out/share/doc/mednafen 27 33 ''; 28 34 29 35 meta = with stdenv.lib; { 30 36 description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; 31 - homepage = http://mednafen.github.io/; 37 + homepage = https://mednafen.github.io/; 32 38 license = licenses.gpl2; 33 - maintainers = [ maintainers.AndersonTorres ]; 39 + maintainers = with maintainers; [ AndersonTorres ]; 34 40 platforms = platforms.linux; 35 41 }; 36 42 }
+4 -8
pkgs/misc/emulators/mednafen/server.nix
··· 1 1 { stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - 5 4 name = "mednafen-server-${version}"; 6 5 version = "0.5.2"; 7 6 8 7 src = fetchurl { 9 - url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz"; 8 + url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz"; 10 9 sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; 11 10 }; 12 11 13 - postInstall = '' 14 - mkdir -p $out/share/$name 15 - install -m 644 -t $out/share/$name standard.conf 16 - ''; 12 + postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; 17 13 18 14 meta = with stdenv.lib; { 19 15 description = "Netplay server for Mednafen"; 20 - homepage = http://mednafen.github.io/; 16 + homepage = https://mednafen.github.io/; 21 17 license = licenses.gpl2; 22 - maintainers = [ maintainers.AndersonTorres ]; 18 + maintainers = with maintainers; [ AndersonTorres ]; 23 19 platforms = platforms.linux; 24 20 }; 25 21 }