summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorJon <jonringer@users.noreply.github.com>2020-01-09 12:29:23 -0800
committerGitHub <noreply@github.com>2020-01-09 12:29:23 -0800
commitdc23abaa23b2c9f0b9868237bbed9464c4c4d195 (patch)
treea12acc298cfeb6eefee95800a3910bd6ac700d73 /pkgs/misc
parent1e6bb7ee0b1c7a5630dff1dd83dd055776d2c65b (diff)
parent26b0bb11deba182dca4a3a599036c9ea2141deb8 (diff)
downloadnixpkgs-dc23abaa23b2c9f0b9868237bbed9464c4c4d195.tar
nixpkgs-dc23abaa23b2c9f0b9868237bbed9464c4c4d195.tar.gz
nixpkgs-dc23abaa23b2c9f0b9868237bbed9464c4c4d195.tar.bz2
nixpkgs-dc23abaa23b2c9f0b9868237bbed9464c4c4d195.tar.lz
nixpkgs-dc23abaa23b2c9f0b9868237bbed9464c4c4d195.tar.xz
nixpkgs-dc23abaa23b2c9f0b9868237bbed9464c4c4d195.tar.zst
nixpkgs-dc23abaa23b2c9f0b9868237bbed9464c4c4d195.zip
Merge pull request #77037 from jonringer/bump-mupen
mupen64plus: 2.5 -> 2.5.9
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/emulators/mupen64plus/default.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 460dd7ad5fb..ee3aab1834a 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -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" ];
   };
 }