From 7644651e6203e645ef4c6fe4f37dd2f76c5f4e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 16 Apr 2017 11:21:28 +0200 Subject: [PATCH] desmume: fix mesa+osmesa It builds fine, but some better testing should be done before merging. --- pkgs/misc/emulators/desmume/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 97cd6a9ca79..02964d0232f 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, mesa_glu, libpcap, SDL, zziplib }: +, mesa_glu, libpcap, SDL, zziplib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -21,10 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch openal desktop_file_utils gtk2 gtkglext libglade pangox_compat - mesa mesa_glu libpcap SDL zziplib ]; + mesa_glu libpcap SDL zziplib ]; configureFlags = [ - "--disable-osmesa" # Failing on compile step "--disable-glade" # Failing on compile step "--enable-openal" "--enable-glx" @@ -46,4 +45,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } -# TODO: investigate osmesa and glade +# TODO: investigate glade