diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:41:34 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:41:34 +0100 |
commit | 0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4 (patch) | |
tree | 1d8b73f5d799dc62efc56a181012abc3e8062c19 /pkgs/misc/emulators | |
parent | 0a085d508ac054e45dfe0a7f24d55b29ca9d4ae9 (diff) | |
parent | 3aa6b8ccc5ad930803e7beb9492f88f6df2c1fdb (diff) | |
download | nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.gz nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.bz2 nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.lz nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.xz nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.zst nixlib-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/dosbox/unstable.nix | 41 | ||||
-rw-r--r-- | pkgs/misc/emulators/fceux/default.nix | 10 | ||||
-rw-r--r-- | pkgs/misc/emulators/wxmupen64plus/default.nix | 13 |
3 files changed, 12 insertions, 52 deletions
diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix deleted file mode 100644 index e1762d66641a..000000000000 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }: - -let revision = "4025"; - revisionDate = "2017-07-02"; - revisionSha = "0hbghdlvm6qibp0df35qxq35km4nza3sm301x380ghamxq2vgy6a"; -in stdenv.mkDerivation rec { - name = "dosbox-unstable-${revisionDate}"; - - src = fetchsvn { - url = "https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk"; - rev = revision; - sha256 = revisionSha; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ SDL SDL_net SDL_sound libpng libGLU_combined ]; - - desktopItem = makeDesktopItem { - name = "dosbox"; - exec = "dosbox"; - comment = "x86 emulator with internal DOS"; - desktopName = "DOSBox (SVN)"; - genericName = "DOS emulator"; - categories = "Application;Emulator;"; - }; - - postInstall = '' - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - ''; - - meta = { - homepage = http://www.dosbox.com/; - description = "A DOS emulator"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ binarin ]; - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 70cf32d54cc2..13ebeb1d2a96 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -8,23 +8,23 @@ stdenv.mkDerivation { sha256 = "0gl2i3qdmcm7v9m5kpfz98w05d8m33990jiwka043ya7lflxvrjb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig scons ]; buildInputs = [ - scons zlib SDL lua5_1 + zlib SDL lua5_1 ]; - phases = "unpackPhase buildPhase"; + sconsFlags = "OPENGL=false GTK=false CREATE_AVI=false LOGO=false"; + prefixKey = "--prefix="; # sed allows scons to find libraries in nix. # mkdir is a hack to make scons succeed. It still doesn't # actually put the files in there due to a bug in the SConstruct file. # OPENGL doesn't work because fceux dlopens the library. - buildPhase = '' + preBuild = '' sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct export CC="gcc" export CXX="g++" mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps" - scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false install ''; meta = { diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 7be911763181..e63d27ec4039 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined}: +{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined +, wafHook }: stdenv.mkDerivation { name = "wxmupen64plus-0.3"; @@ -7,23 +8,23 @@ stdenv.mkDerivation { sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; }; + nativeBuildInputs = [ wafHook ]; buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ]; - configurePhase = '' + preConfigure = '' tar xf ${mupen64plus.src} APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" export LDFLAGS="-lwx_gtk2u_adv-2.9" - python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out + + configureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`") ''; - buildPhase = "python waf"; - installPhase = "python waf install"; + NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; license = stdenv.lib.licenses.gpl2Plus; homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; - broken = true; }; } |