diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-04 21:43:40 +0200 |
commit | eb2e46aab26600484bfabb3c242bdd069279bdb1 (patch) | |
tree | 18ec0523bfcd0967f8eef326756f96dc0075789a /pkgs/misc/emulators | |
parent | 16f45507619b4c4012bb7958fba09eb3bdc5ac87 (diff) | |
parent | 22d4472d2744639ccd880f015bb3147cf5222f07 (diff) | |
download | nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.gz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.bz2 nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.lz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.xz nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.tar.zst nixlib-eb2e46aab26600484bfabb3c242bdd069279bdb1.zip |
Merge branch 'master' into x-updates
Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/mupen64plus/1.5.nix | 33 | ||||
-rw-r--r-- | pkgs/misc/emulators/wine/winetricks.nix | 1 | ||||
-rw-r--r-- | pkgs/misc/emulators/wxmupen64plus/default.nix | 28 |
3 files changed, 62 insertions, 0 deletions
diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix new file mode 100644 index 000000000000..d67121fe430a --- /dev/null +++ b/pkgs/misc/emulators/mupen64plus/1.5.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/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 8a0901ddb803..71cc2767f698 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "http://winetricks.googlecode.com/svn/trunk"; inherit rev; + sha256 = "01v13qw4sxmfm09g9amqycnzy743gdrhvv23rjr9255dzlrj1s8f"; }; buildInputs = [ perl which ]; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix new file mode 100644 index 000000000000..a85d0fb389e2 --- /dev/null +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, mesa}: + +stdenv.mkDerivation { + name = "wxmupen64plus-0.3"; + src = fetchurl { + url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2"; + sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; + }; + + buildInputs = [ python wxGTK29 SDL libX11 mesa ]; + + configurePhase = '' + tar xf ${mupen64plus.src} + APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) + export CXXFLAGS="-I${libX11}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" + export LDFLAGS="-lwx_gtk2u_adv-2.9" + python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out + ''; + + buildPhase = "python waf"; + installPhase = "python waf install"; + + meta = { + description = "GUI for the Mupen64Plus 2.0 emulator"; + license = "GPLv2+"; + homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; + }; +} |