Merge pull request #289867 from qubitnano/origin-cemu-imgui

cemu: 2.0-65 -> 2.0-66, pin imgui 1.90.1

authored by Mario Rodas and committed by GitHub ad46e10c 52fd6a49

+18 -13
+18 -13
pkgs/applications/emulators/cemu/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub 2 - , fetchpatch 3 2 , addOpenGLRunpath 4 3 , wrapGAppsHook 5 4 , cmake ··· 32 31 , nix-update-script 33 32 }: 34 33 35 - stdenv.mkDerivation rec { 34 + let 35 + # cemu doesn't build with imgui 1.90.2 or newer: 36 + # error: 'struct ImGuiIO' has no member named 'ImeWindowHandle' 37 + imgui' = imgui.overrideAttrs rec { 38 + version = "1.90.1"; 39 + src = fetchFromGitHub { 40 + owner = "ocornut"; 41 + repo = "imgui"; 42 + rev = "v${version}"; 43 + sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; 44 + }; 45 + }; 46 + 47 + in stdenv.mkDerivation rec { 36 48 pname = "cemu"; 37 - version = "2.0-65"; 49 + version = "2.0-66"; 38 50 39 51 src = fetchFromGitHub { 40 52 owner = "cemu-project"; 41 53 repo = "Cemu"; 42 54 rev = "v${version}"; 43 - hash = "sha256-jsDmxol3zZMmpo4whDeUXTzfO+QVK/h6lItXTyJyoak="; 55 + hash = "sha256-1s1H2rJuN9lRNanKXxKWMLBOFg5z3IwpJCZCmymAH9Y="; 44 56 }; 45 57 46 58 patches = [ ··· 48 60 # > The following imported targets are referenced, but are missing: 49 61 # > SPIRV-Tools-opt 50 62 ./cmakelists.patch 51 - 52 - # Remove on next release 53 - # https://github.com/cemu-project/Cemu/pull/1076 54 - (fetchpatch { 55 - url = "https://github.com/cemu-project/Cemu/commit/72aacbdcecc064ea7c3b158c433e4803496ac296.patch"; 56 - hash = "sha256-x+ZVqXgGRSv0VYwJAX35C1p7PnmCHS7iEO+4k8j0/ug="; 57 - }) 58 63 ]; 59 64 60 65 nativeBuildInputs = [ ··· 75 80 glm 76 81 gtk3 77 82 hidapi 78 - imgui 83 + imgui' 79 84 libpng 80 85 libusb1 81 86 libzip ··· 103 108 tag = last (splitString "-" version); 104 109 in '' 105 110 rm -rf dependencies/imgui 106 - ln -s ${imgui}/include/imgui dependencies/imgui 111 + ln -s ${imgui'}/include/imgui dependencies/imgui 107 112 substituteInPlace src/Common/version.h --replace " (experimental)" "-${tag} (experimental)" 108 113 substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" 109 114 '';