yuzu-{mainline,early-access}: {546,1480} -> {576,1536}
This commit is contained in:
parent
188df3cfe6
commit
3bf401f248
|
@ -6,11 +6,15 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||||
deps_file="$(realpath "./deps.nix")"
|
deps_file="$(realpath "./deps.nix")"
|
||||||
|
|
||||||
nix-prefetch-git https://github.com/ryujinx/ryujinx --quiet > repo_info
|
nix-prefetch-git https://github.com/ryujinx/ryujinx --quiet > repo_info
|
||||||
new_hash="$(cat repo_info | jq -r ".sha256")"
|
new_hash="$(jq -r ".sha256" < repo_info)"
|
||||||
new_rev="$(cat repo_info | jq -r ".rev")"
|
new_rev="$(jq -r ".rev" < repo_info)"
|
||||||
rm repo_info
|
rm repo_info
|
||||||
|
|
||||||
new_version="$(curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master | grep -Po '"version":.*?[^\\]",' | sed 's/"version":"\(.*\)",/\1/')"
|
new_version="$(
|
||||||
|
curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master \
|
||||||
|
| grep -Po '"version":.*?[^\\]",' \
|
||||||
|
| sed 's/"version":"\(.*\)",/\1/'
|
||||||
|
)"
|
||||||
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
|
old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
|
||||||
|
|
||||||
if [[ "$new_version" == "$old_version" ]]; then
|
if [[ "$new_version" == "$old_version" ]]; then
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ pname, version, src, branchName
|
{ pname, version, src, branchName
|
||||||
, stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook
|
, stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook
|
||||||
, cmake, pkg-config
|
, cmake, pkg-config
|
||||||
, libpulseaudio, libjack2, alsaLib, sndio, ecasound
|
, libpulseaudio, libjack2, alsaLib, sndio
|
||||||
, vulkan-loader, vulkan-headers
|
, vulkan-loader, vulkan-headers
|
||||||
, qtbase, qtwebengine, qttools
|
, qtbase, qtwebengine, qttools
|
||||||
, nlohmann_json, rapidjson
|
, nlohmann_json, rapidjson
|
||||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libpulseaudio libjack2 alsaLib sndio ecasound
|
libpulseaudio libjack2 alsaLib sndio
|
||||||
vulkan-loader vulkan-headers
|
vulkan-loader vulkan-headers
|
||||||
qtbase qtwebengine qttools
|
qtbase qtwebengine qttools
|
||||||
nlohmann_json rapidjson
|
nlohmann_json rapidjson
|
||||||
|
|
|
@ -4,25 +4,25 @@ let
|
||||||
in {
|
in {
|
||||||
mainline = libsForQt5.callPackage ./base.nix rec {
|
mainline = libsForQt5.callPackage ./base.nix rec {
|
||||||
pname = "yuzu-mainline";
|
pname = "yuzu-mainline";
|
||||||
version = "546";
|
version = "576";
|
||||||
branchName = branch;
|
branchName = branch;
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "yuzu-emu";
|
owner = "yuzu-emu";
|
||||||
repo = "yuzu-mainline";
|
repo = "yuzu-mainline";
|
||||||
rev = "mainline-0-${version}";
|
rev = "mainline-0-${version}";
|
||||||
sha256 = "0d6cbhp877xyjac1flkyjf6g6igzmvjlk6gcph4m04i4zivb9kf2";
|
sha256 = "121pn3kmghpcf4pzs0mc8z3viyp32rzm7rssva7cdd5016z2648k";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
early-access = libsForQt5.callPackage ./base.nix rec {
|
early-access = libsForQt5.callPackage ./base.nix rec {
|
||||||
pname = "yuzu-ea";
|
pname = "yuzu-ea";
|
||||||
version = "1480";
|
version = "1536";
|
||||||
branchName = branch;
|
branchName = branch;
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pineappleEA";
|
owner = "pineappleEA";
|
||||||
repo = "pineapple-src";
|
repo = "pineapple-src";
|
||||||
rev = "EA-${version}";
|
rev = "EA-${version}";
|
||||||
sha256 = "0flc5mckmnr9gj8f78nh9nys96inlkqk3rvpgbpl0mhcg6lmlb2g";
|
sha256 = "0smrx05xxr4b96i8bw6n6pynkl9r21ydfvpjdzxkr9amin20r54y";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}.${branch}
|
}.${branch}
|
||||||
|
|
Loading…
Reference in New Issue