Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e6bb7ee0b1c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dc23abaa23b2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 9, 2020

  1. mupen64plus: 2.5 -> 2.5.9, target x86_64-linux only

    Jonathan Ringer committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    26b0bb1 View commit details

  2. Merge pull request #77037 from jonringer/bump-mupen 

    mupen64plus: 2.5 -> 2.5.9
    Jon authored Jan 9, 2020
    Copy the full SHA
    dc23aba View commit details
Showing with 8 additions and 8 deletions.
  1. +8 −8 pkgs/misc/emulators/mupen64plus/default.nix
16 changes: 8 additions & 8 deletions pkgs/misc/emulators/mupen64plus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib, nasm }:

stdenv.mkDerivation rec {
pname = "mupen64plus";
version = "2.5";
version = "2.5.9";

src = fetchurl {
url = "https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/mupen64plus-bundle-src-${version}.tar.gz";
sha256 = "0rmsvfn4zfvbhz6gf1xkb7hnwflv6sbklwjz2xk4dlpj4vcbjxcw";
sha256 = "1a21n4gqdvag6krwcjm5bnyw5phrlxw6m0mk73jy53iq03f3s96m";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig nasm ];
buildInputs = [ boost dash freetype libpng SDL which zlib ];

buildPhase = ''
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
dash m64p_install.sh DESTDIR="$out" PREFIX=""
'';

meta = {
meta = with stdenv.lib; {
description = "A Nintendo 64 Emulator";
license = stdenv.lib.licenses.gpl2Plus;
license = licenses.gpl2Plus;
homepage = http://www.mupen64plus.org/;
maintainers = [ stdenv.lib.maintainers.sander ];
platforms = stdenv.lib.platforms.linux;
maintainers = [ maintainers.sander ];
platforms = [ "x86_64-linux" ];
};
}