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

Merge #24949: desmume: fix mesa+osmesa

Browse Source
This commit is contained in:
Vladimír Čunát
2017-05-01 23:55:14 +02:00
parent 30c0a2ca2e 7644651e62
commit f1ed43c14e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/desmume/default.nix
+3 -4
View File
@@ -5,7 +5,7 @@
, agg, alsaLib, soundtouch, openal , agg, alsaLib, soundtouch, openal
, desktop_file_utils , desktop_file_utils
, gtk2, gtkglext, libglade, pangox_compat , gtk2, gtkglext, libglade, pangox_compat
, mesa, mesa_glu, libpcap, SDL, zziplib }: , mesa_glu, libpcap, SDL, zziplib }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -21,10 +21,9 @@ stdenv.mkDerivation rec {
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
mesa mesa_glu libpcap SDL zziplib ]; mesa_glu libpcap SDL zziplib ];
configureFlags = [ configureFlags = [
"--disable-osmesa" # Failing on compile step
"--disable-glade" # Failing on compile step "--disable-glade" # Failing on compile step
"--enable-openal" "--enable-openal"
"--enable-glx" "--enable-glx"
@@ -46,4 +45,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }
# TODO: investigate osmesa and glade # TODO: investigate glade