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/zsnes/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/zsnes/default.nix')
| -rw-r--r-- | pkgs/misc/emulators/zsnes/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index ad80cb13f78c..1ea8d7e68d3c 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, mesa +{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU_combined , makeDesktopItem }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation { sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa ]; + buildInputs = [ nasm SDL zlib libpng ncurses libGLU_combined ]; prePatch = '' for i in $(cat debian/patches/series); do |