diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/games/sm64ex | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/games/sm64ex')
-rw-r--r-- | pkgs/games/sm64ex/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index e5aeb84fbf1..9bf6b513843 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3 , pkg-config @@ -26,20 +26,20 @@ stdenv.mkDerivation rec { pname = "sm64ex"; - version = "unstable-2020-06-19"; + version = "unstable-2020-10-09"; src = fetchFromGitHub { owner = "sm64pc"; repo = "sm64ex"; - rev = "f5005418348cf1a53bfa75ff415a513ef0b9b273"; - sha256 = "0adyshkqk5c4lxhdxc3j6ax4svfka26486qpa5q2gl2nixwg9zxn"; + rev = "57c203465b2b3eee03dcb796ed1fad07d8283a2c"; + sha256 = "0k6a3r9f4spa7y2v1lyqs9lwa05lw8xgywllb7w828nal8y33cs6"; }; nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ audiofile SDL2 hexdump ]; makeFlags = [ "VERSION=${region}" ] ++ compileFlags - ++ stdenv.lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; + ++ lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; inherit baseRom; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/sm64pc/sm64ex"; description = "Super Mario 64 port based off of decompilation"; longDescription = '' |