diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-11 17:28:07 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-11 17:28:07 -0400 |
| commit | aabfda6d5d3865e57041376a95d8b78140f8d54b (patch) | |
| tree | 178570763c876f1755310d191b39b2aa1fbef340 /pkgs/misc/emulators/desmume/default.nix | |
| parent | 55ff6caf5e77aa46a91b496bacd275ef3ddc662a (diff) | |
| parent | 7079e744d4666db3af186899fe2fc0ef3cbeb842 (diff) | |
| download | nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.gz nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.bz2 nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.lz nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.xz nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.tar.zst nixlib-aabfda6d5d3865e57041376a95d8b78140f8d54b.zip | |
Merge branch 'merge/master-to-staging-20180310' of git://github.com/oxij/nixpkgs into staging
Diffstat (limited to 'pkgs/misc/emulators/desmume/default.nix')
| -rw-r--r-- | pkgs/misc/emulators/desmume/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index a919d21626b6..d177012546e9 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -5,7 +5,7 @@ , agg, alsaLib, soundtouch, openal , desktop-file-utils , gtk2, gtkglext, libglade, pangox_compat -, mesa_glu, libpcap, SDL, zziplib }: +, libGLU, libpcap, SDL, zziplib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -26,10 +26,12 @@ stdenv.mkDerivation rec { }) ]; + CXXFLAGS = "-fpermissive"; + buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch openal desktop-file-utils gtk2 gtkglext libglade pangox_compat - mesa_glu libpcap SDL zziplib ]; + libGLU libpcap SDL zziplib ]; configureFlags = [ "--disable-glade" # Failing on compile step |