From c96d4190ab6e81cef141d3171953879c00f15a1f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 22 Jun 2023 13:07:33 +0300 Subject: [PATCH] yuzu: 1452 -> 1475, yuzu-ea: 3621 -> 3702 --- pkgs/applications/emulators/yuzu/generic.nix | 13 ++++++++++++- pkgs/applications/emulators/yuzu/sources.nix | 14 +++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/generic.nix b/pkgs/applications/emulators/yuzu/generic.nix index d583928d88ca..3fdd6db84661 100644 --- a/pkgs/applications/emulators/yuzu/generic.nix +++ b/pkgs/applications/emulators/yuzu/generic.nix @@ -15,6 +15,7 @@ , discord-rpc , doxygen , enet +, fetchurl , ffmpeg , fmt , glslang @@ -47,7 +48,13 @@ , zstd }: -stdenv.mkDerivation { +let + tzinfoVersion = "220816"; + tzinfo = fetchurl { + url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${tzinfoVersion}/${tzinfoVersion}.zip"; + hash = "sha256-yv8ykEYPu9upeXovei0u16iqQ7NasH6873KnQy4+KwI="; + }; +in stdenv.mkDerivation { pname = "yuzu-${branch}"; inherit version src; @@ -141,6 +148,10 @@ stdenv.mkDerivation { "-DTITLE_BAR_FORMAT_IDLE=yuzu | ${branch} ${version} (nixpkgs) {}" "-DTITLE_BAR_FORMAT_RUNNING=yuzu | ${branch} ${version} (nixpkgs) | {}" ) + + # provide pre-downloaded tz data + mkdir -p build/externals/nx_tzdb + ln -sf ${tzinfo} build/externals/nx_tzdb/${tzinfoVersion}.zip ''; # This must be done after cmake finishes as it overwrites the file diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix index 2f9b70b40767..676b9db8f833 100644 --- a/pkgs/applications/emulators/yuzu/sources.nix +++ b/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-05-30 +# Last updated: 2023-06-22 { compatList = { - rev = "a6be5914e4e5891aafdd5dd55e84649b893cbeac"; + rev = "2288f79cad3be4c2c3148435372958aebea33156"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1452"; - hash = "sha256:1dmk0asrhvkd3cnng4bw294shcy9j3dd4kcsycam2vdvr08v5yb8"; + version = "1475"; + hash = "sha256:1948lqk89k7b48skcikjx3i3f8nwb6n6sh2bf00qqbchr8i27gpm"; }; ea = { - version = "3621"; - distHash = "sha256:0p8rxpwn9f269008skj7dy6qinpax93jhp33769akrprbh7f22if"; - fullHash = "sha256:1ph8frqifk42ypa0fw604k1z4kjisl35cai830cg4zhvd0vv7rn5"; + version = "3702"; + distHash = "sha256:178mfg7rxr1372favkkizdcjv1ckfkzmjqfpw6ja3c5kv0psv19j"; + fullHash = "sha256:00ls667l8zaj8597saw6drd28x4k02iqh3l7rxjjxkcqny6qv6p8"; }; }