diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-31 19:44:58 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-31 19:44:58 +0000 |
commit | 1b427fe052fa650c87a83c5c0e838f3ef92a52e2 (patch) | |
tree | d3cc0d9ae350a8a4db8c06531076452384d5399e /pkgs/misc | |
parent | 483bedccda1ece4f4404c652ddc080f8aca79f50 (diff) | |
parent | fc5ea05cfd4f76a4b32833bfe6f3b9fe68cfd93d (diff) |
* Sync with the trunc.
* Fixed the hash in PulseAudio: I updated the name/version, but forgot to update the hash. So secretly it was still building the old version. Also, now that we've realised that the PulseAudio server and library don't need to be the same build, disable some dependencies by default (avahi and bluez). svn path=/nixpkgs/branches/kde-4.7/; revision=28023
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/VisualBoyAdvance/default.nix | 23 | ||||
-rw-r--r-- | pkgs/misc/emulators/VisualBoyAdvance/fix.diff | 31 | ||||
-rw-r--r-- | pkgs/misc/emulators/mupen64plus/default.nix | 33 | ||||
-rw-r--r-- | pkgs/misc/emulators/uae/default.nix | 7 | ||||
-rw-r--r-- | pkgs/misc/emulators/vice/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/emulators/zsnes/default.nix | 4 |
6 files changed, 98 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix new file mode 100644 index 0000000000000..964a0491adb4a --- /dev/null +++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, zlib, libpng, SDL, nasm}: + +stdenv.mkDerivation { + name = "VisualBoyAdvance-1.7.2"; + src = fetchurl { + url = mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz; + sha256 = "1dr9w5i296dyq2gbx7sijk6p375aqnwld2n6rwnbzm2g3a94y4gl"; + }; + patches = [ ./fix.diff ]; # patch to shut up lost of precision errors + preConfigure = '' + # Fix errors with invalid conversion from 'const char*' to 'char*' + sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/GBA.cpp + sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp + ''; + buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; + + meta = { + description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator"; + license = "GPLv2+"; + maintainers = [ stdenv.lib.maintainers.sander ]; + homepage = http://vba.ngemu.com; + }; +} diff --git a/pkgs/misc/emulators/VisualBoyAdvance/fix.diff b/pkgs/misc/emulators/VisualBoyAdvance/fix.diff new file mode 100644 index 0000000000000..646db9c45e661 --- /dev/null +++ b/pkgs/misc/emulators/VisualBoyAdvance/fix.diff @@ -0,0 +1,31 @@ +diff -urN ../tmp-orig/visualboyadvance-1.7.2/src/sdl/debugger.cpp +./src/sdl/debugger.cpp +--- ../tmp-orig/visualboyadvance-1.7.2/src/sdl/debugger.cpp 2004-05-13 +16:13:14.000000000 +0200 ++++ ./src/sdl/debugger.cpp 2005-03-21 21:57:06.000000000 +0100 +@@ -950,9 +950,9 @@ + { + u32 address = 0; + if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff]) +- address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]); ++ address = 0x2000000 + ((unsigned long)mem - (unsigned long)&workRAM[0]); + else +- address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]); ++ address = 0x3000000 + ((unsigned long)mem - (unsigned long)&internalRAM[0]); + + if(size == 2) + printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", +diff -urN ../tmp-orig/visualboyadvance-1.7.2/src/prof/prof.cpp +./src/prof/prof.cpp +--- ../tmp-orig/visualboyadvance-1.7.2/src/prof/prof.cpp 2004-05-13 +16:31:58.000000000 +0200 ++++ ./src/prof/prof.cpp 2005-03-21 21:56:27.000000000 +0100 +@@ -266,7 +266,7 @@ + for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) { + if(profWrite8(fd, GMON_TAG_CG_ARC) || + profWrite32(fd, (u32)frompc) || +- profWrite32(fd, (u32)tos[toindex].selfpc) || ++ profWrite32(fd, (unsigned long)tos[toindex].selfpc) || + profWrite32(fd, tos[toindex].count)) { + systemMessage(0, "mcount: arc"); + fclose(fd); diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix new file mode 100644 index 0000000000000..d67121fe430ac --- /dev/null +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}: + +stdenv.mkDerivation { + name = "mupen64plus-1.5"; + src = fetchurl { + url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz; + sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq"; + }; + + buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ]; + + preConfigure = '' + # Some C++ incompatibility fixes + sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp + sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp + + # Fix some hardcoded paths + sed -i -e "s|/usr/local|$out|g" main/main.c + + # Remove PATH environment variable from install script + sed -i -e "s|export PATH=|#export PATH=|" ./install.sh + ''; + + buildPhase = "make all"; + installPhase = "PREFIX=$out make install"; + + meta = { + description = "A Nintendo 64 Emulator"; + license = "GPLv2+"; + homepage = http://code.google.com/p/mupen64plus; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index ad68be11e9504..9f93c9957d650 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -8,4 +8,11 @@ stdenv.mkDerivation { }; configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; buildInputs = [ pkgconfig gtk alsaLib SDL ]; + + meta = { + description = "Ultimate/Unix/Unusuable Amiga Emulator"; + license = "GPLv2+"; + homepage = http://www.amigaemulator.org; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; } diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 293fe43d06537..425080d7c6253 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; homepage = http://www.viceteam.org; - license = "GPL"; + license = "GPLv2+"; maintainers = [ lib.maintainers.sander ]; }; } diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index d878d34184a85..0b34fc0f9fec7 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation { meta = { description = "A Super Nintendo Entertainment System Emulator"; - license = "GPLv2"; + license = "GPLv2+"; + maintainers = [ stdenv.lib.maintainers.sander ]; + homepage = http://www.zsnes.com; }; } \ No newline at end of file |