diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-11 19:32:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 19:32:35 +0100 |
| commit | 3f18ad185f87c1fce36b4b5d1069366521b3806b (patch) | |
| tree | fec2b36518f7f2cc735fb36c5bdc4c39be0dbc98 /pkgs/misc | |
| parent | 9f4fa7339b345b43bb399acfb6316e62414cd5b2 (diff) | |
| parent | 55b5a94d845ff46d7d03ccdc08557c6cce048c8e (diff) | |
| download | nixlib-3f18ad185f87c1fce36b4b5d1069366521b3806b.tar nixlib-3f18ad185f87c1fce36b4b5d1069366521b3806b.tar.gz nixlib-3f18ad185f87c1fce36b4b5d1069366521b3806b.tar.bz2 nixlib-3f18ad185f87c1fce36b4b5d1069366521b3806b.tar.lz nixlib-3f18ad185f87c1fce36b4b5d1069366521b3806b.tar.xz nixlib-3f18ad185f87c1fce36b4b5d1069366521b3806b.tar.zst nixlib-3f18ad185f87c1fce36b4b5d1069366521b3806b.zip | |
Merge pull request #29207 from markus2342/fix-desmume-gcc6
desmume: fix build with gcc6 by adding debian patch
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/desmume/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 02964d0232f5..3e7b033b5788 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch , pkgconfig, libtool, intltool , libXmu , lua @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs"; }; + patches = [ + (fetchpatch { + name = "gcc6_fixes.patch"; + url = "https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/desmume/debian/patches/gcc6_fixes.patch?revision=15925"; + sha256 = "0j3fmxz0mfb3f4biks03pyz8f9hy958ks6qplisl60rzq9v9qpks"; + }) + ]; + buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch openal desktop_file_utils gtk2 gtkglext libglade pangox_compat |