diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-30 03:06:54 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-30 03:07:44 +0100 |
commit | 7cf1d11a3e3ddac39b008eb4f838a9466859f576 (patch) | |
tree | 1d957759940d22073a03599e504e5ecbd61d605b /pkgs/misc/emulators | |
parent | 129fbd75501785f4e3308d6160590ba465964c5f (diff) | |
download | nixpkgs-7cf1d11a3e3ddac39b008eb4f838a9466859f576.tar nixpkgs-7cf1d11a3e3ddac39b008eb4f838a9466859f576.tar.gz nixpkgs-7cf1d11a3e3ddac39b008eb4f838a9466859f576.tar.bz2 nixpkgs-7cf1d11a3e3ddac39b008eb4f838a9466859f576.tar.lz nixpkgs-7cf1d11a3e3ddac39b008eb4f838a9466859f576.tar.xz nixpkgs-7cf1d11a3e3ddac39b008eb4f838a9466859f576.tar.zst nixpkgs-7cf1d11a3e3ddac39b008eb4f838a9466859f576.zip |
emulationstation: fix build w/ recent versions of gcc
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/emulationstation/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 668d1804544..722f6b25429 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen -, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive }: +, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive +, fetchpatch }: stdenv.mkDerivation { pname = "emulationstation"; @@ -12,14 +13,22 @@ stdenv.mkDerivation { sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + patches = [ + (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 = '' install -D ../emulationstation $out/bin/emulationstation ''; + enableParallelBuilding = true; + meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; homepage = https://emulationstation.org; |