diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix deleted file mode 100644 index 015c61e461e..00000000000 --- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{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 = [ ./libpng15.patch ./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 = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - homepage = http://vba.ngemu.com; - broken = true; - }; -} diff --git a/pkgs/misc/emulators/VisualBoyAdvance/fix.diff b/pkgs/misc/emulators/VisualBoyAdvance/fix.diff deleted file mode 100644 index 646db9c45e6..00000000000 --- a/pkgs/misc/emulators/VisualBoyAdvance/fix.diff +++ /dev/null @@ -1,31 +0,0 @@ -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/VisualBoyAdvance/libpng15.patch b/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch deleted file mode 100644 index b6f8872ce2b..00000000000 --- a/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch +++ /dev/null @@ -1,13 +0,0 @@ -From Gentoo. Fixes compilation with libpng-1.5 - ---- a/src/Util.cpp -+++ b/src/Util.cpp -@@ -79,7 +79,7 @@ - return false; - } - -- if(setjmp(png_ptr->jmpbuf)) { -+ if(setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr,NULL); - fclose(fp); - return false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c79d828059..6b07bccda78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15722,8 +15722,6 @@ let vips = callPackage ../tools/graphics/vips { }; nip2 = callPackage ../tools/graphics/nip2 { }; - VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { }; - wavegain = callPackage ../applications/audio/wavegain { }; wcalc = callPackage ../applications/misc/wcalc { };