diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-01 23:50:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-01 23:55:14 +0200 |
| commit | f1ed43c14e3d8d66e97a5a145221da9ecb8e4ec4 (patch) | |
| tree | a45d9382991421b29b586f53b28782e8796c619a /pkgs/misc/emulators | |
| parent | 30c0a2ca2e9194c8b28d1bf4f5b7b51cb5b63d7e (diff) | |
| parent | 7644651e6203e645ef4c6fe4f37dd2f76c5f4e40 (diff) | |
| download | nixlib-f1ed43c14e3d8d66e97a5a145221da9ecb8e4ec4.tar nixlib-f1ed43c14e3d8d66e97a5a145221da9ecb8e4ec4.tar.gz nixlib-f1ed43c14e3d8d66e97a5a145221da9ecb8e4ec4.tar.bz2 nixlib-f1ed43c14e3d8d66e97a5a145221da9ecb8e4ec4.tar.lz nixlib-f1ed43c14e3d8d66e97a5a145221da9ecb8e4ec4.tar.xz nixlib-f1ed43c14e3d8d66e97a5a145221da9ecb8e4ec4.tar.zst nixlib-f1ed43c14e3d8d66e97a5a145221da9ecb8e4ec4.zip | |
Merge #24949: desmume: fix mesa+osmesa
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/desmume/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 97cd6a9ca798..02964d0232f5 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 |