Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

emulationstation: 2.0.1a -> 2.11.2

+9 -18
+9 -18
pkgs/applications/emulators/emulationstation/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen 2 - , freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive 3 - , fetchpatch }: 2 + , freeimage, freetype, libGLU, libGL, rapidjson, SDL2, alsa-lib 3 + , vlc }: 4 4 5 5 stdenv.mkDerivation { 6 6 pname = "emulationstation"; 7 - version = "2.0.1a"; 7 + version = "2.11.2"; 8 8 9 9 src = fetchFromGitHub { 10 - owner = "Aloshi"; 10 + fetchSubmodules = true; 11 + owner = "RetroPie"; 11 12 repo = "EmulationStation"; 12 - rev = "646bede3d9ec0acf0ae378415edac136774a66c5"; 13 - sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; 13 + rev = "cda7de687924c4c1ab83d6b0ceb88aa734fe6cfe"; 14 + hash = "sha256-J5h/578FVe4DXJx/AvpRnCIUpqBeFtmvFhUDYH5SErQ="; 14 15 }; 15 16 16 - patches = [ 17 - (fetchpatch { 18 - url = "https://github.com/Aloshi/EmulationStation/commit/49ccd8fc7a7b1dfd974fc57eb13317c42842f22c.patch"; 19 - sha256 = "1v5d81l7bav0k5z4vybrc3rjcysph6lkm5pcfr6m42wlz7jmjw0p"; 20 - }) 21 - ]; 22 - 23 - postPatch = '' 24 - sed -i "7i #include <stack>" es-app/src/views/gamelist/ISimpleGameListView.h 25 - ''; 26 - 27 17 nativeBuildInputs = [ pkg-config cmake ]; 28 - buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; 18 + buildInputs = [ alsa-lib boost curl eigen freeimage freetype libGLU libGL rapidjson SDL2 vlc ]; 29 19 30 20 installPhase = '' 31 21 install -D ../emulationstation $out/bin/emulationstation 22 + cp -r ../resources/ $out/bin/resources/ 32 23 ''; 33 24 34 25 meta = {