mupen64plus1_5: removed

This was the same as mupen64plus, alias added.
This commit is contained in:
Robin Gloster 2016-02-12 12:42:00 +00:00
parent fd8bd17c3e
commit 57d63ad537
2 changed files with 2 additions and 35 deletions

View file

@ -1,33 +0,0 @@
{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 = stdenv.lib.licenses.gpl2Plus;
homepage = http://code.google.com/p/mupen64plus;
maintainers = [ stdenv.lib.maintainers.sander ];
};
}

View file

@ -15607,8 +15607,6 @@ let
mupen64plus = callPackage ../misc/emulators/mupen64plus { };
mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
inherit (callPackages ../tools/package-management/nix {
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
@ -16030,6 +16028,8 @@ aliases = with self; rec {
midoriWrapper = midori; # added 2015-01
mlt-qt5 = qt5.mlt; # added 2015-12-19
multipath_tools = multipath-tools; # added 2016-01-21
mupen64plus1_5 = mupen64plus; # added 2016-02-12
ncat = nmap; # added 2016-01-26
nfsUtils = nfs-utils; # added 2014-12-06
phonon_qt5 = qt5.phonon; # added 2015-12-19
phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19