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

emulationstation: fix build w/ recent versions of gcc

Browse Source
This commit is contained in:
Franz Pletz 2019-12-30 03:06:54 +01:00
parent 129fbd7550
commit 7cf1d11a3e
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/misc/emulators/emulationstation/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen
, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive }: , freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive
, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "emulationstation"; pname = "emulationstation";
@ -12,14 +13,22 @@ stdenv.mkDerivation {
sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v";
}; };
nativeBuildInputs = [ pkgconfig ]; patches = [
buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; (fetchpatch {
url = "https://github.com/Aloshi/EmulationStation/commit/49ccd8fc7a7b1dfd974fc57eb13317c42842f22c.patch";
sha256 = "1v5d81l7bav0k5z4vybrc3rjcysph6lkm5pcfr6m42wlz7jmjw0p";
})
];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];
buildPhase = "cmake . && make";
installPhase = '' installPhase = ''
install -D ../emulationstation $out/bin/emulationstation install -D ../emulationstation $out/bin/emulationstation
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes";
homepage = https://emulationstation.org; homepage = https://emulationstation.org;

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

@ -24526,9 +24526,7 @@ in
dumb = callPackage ../misc/dumb { }; dumb = callPackage ../misc/dumb { };
emulationstation = callPackage ../misc/emulators/emulationstation { emulationstation = callPackage ../misc/emulators/emulationstation { };
stdenv = gcc5Stdenv;
};
electricsheep = callPackage ../misc/screensavers/electricsheep { }; electricsheep = callPackage ../misc/screensavers/electricsheep { };