diff options
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators/desmume/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/misc/emulators/desmume/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/desmume/default.nix b/nixpkgs/pkgs/misc/emulators/desmume/default.nix index 6bb5be3c7137..d5d63cc26944 100644 --- a/nixpkgs/pkgs/misc/emulators/desmume/default.nix +++ b/nixpkgs/pkgs/misc/emulators/desmume/default.nix @@ -2,9 +2,10 @@ , pkgconfig, libtool, intltool , libXmu , lua +, tinyxml , agg, alsaLib, soundtouch, openal , desktop-file-utils -, gtk2, gtkglext, libglade, pangox_compat +, gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: with stdenv.lib; @@ -19,19 +20,17 @@ stdenv.mkDerivation rec { }; 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"; - }) + ./gcc6_fixes.patch + ./gcc7_fixes.patch + ./01_use_system_tinyxml.patch ]; CXXFLAGS = "-fpermissive"; buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch - openal desktop-file-utils gtk2 gtkglext libglade pangox_compat - libGLU libpcap SDL zziplib ]; + openal desktop-file-utils gtk2 gtkglext libglade + libGLU libpcap SDL zziplib tinyxml ]; configureFlags = [ "--disable-glade" # Failing on compile step |