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

Merge pull request #29207 from markus2342/fix-desmume-gcc6

Browse Source 
desmume: fix build with gcc6 by adding debian patch
This commit is contained in:
Jörg Thalheim 2017-09-11 19:32:35 +01:00 committed by GitHub
commit 3f18ad185f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/misc/emulators/desmume/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl { stdenv, fetchurl, fetchpatch
, pkgconfig, libtool, intltool , pkgconfig, libtool, intltool
, libXmu , libXmu
, lua , lua
@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs"; 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 = buildInputs =
[ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch
openal desktop_file_utils gtk2 gtkglext libglade pangox_compat openal desktop_file_utils gtk2 gtkglext libglade pangox_compat