diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-20 01:14:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-20 01:14:08 +0100 |
commit | 76c526a4fb062f4724be8b93c57a61db68feb187 (patch) | |
tree | c6378cb83b5643d403828a93e0865584469961ca /pkgs/misc/emulators | |
parent | b0a78e25bfe391a5483ed34dcacd6d32cf05a452 (diff) | |
parent | c3bc0379206b6f40a677235ec793bde8f06de0bf (diff) | |
download | nixpkgs-76c526a4fb062f4724be8b93c57a61db68feb187.tar nixpkgs-76c526a4fb062f4724be8b93c57a61db68feb187.tar.gz nixpkgs-76c526a4fb062f4724be8b93c57a61db68feb187.tar.bz2 nixpkgs-76c526a4fb062f4724be8b93c57a61db68feb187.tar.lz nixpkgs-76c526a4fb062f4724be8b93c57a61db68feb187.tar.xz nixpkgs-76c526a4fb062f4724be8b93c57a61db68feb187.tar.zst nixpkgs-76c526a4fb062f4724be8b93c57a61db68feb187.zip |
Merge pull request #75909 from jtojnar/gtkglext-fix
Do not depend on pangox_compat
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/desmume/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 67fb3b4d24b..d5d63cc2694 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -5,7 +5,7 @@ , tinyxml , agg, alsaLib, soundtouch, openal , desktop-file-utils -, gtk2, gtkglext, libglade, pangox_compat +, gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch - openal desktop-file-utils gtk2 gtkglext libglade pangox_compat + openal desktop-file-utils gtk2 gtkglext libglade libGLU libpcap SDL zziplib tinyxml ]; configureFlags = [ |