Unverified Commit ad46e10c authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

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

cemu: 2.0-65 -> 2.0-66, pin imgui 1.90.1
parents 52fd6a49 3ab1bb14

pkgs/applications/emulators/cemu/default.nix

+18 −13
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub

, fetchpatch

, addOpenGLRunpath

, wrapGAppsHook

, cmake
@@ -32,15 +31,28 @@ 
, nix-update-script

}:



stdenv.mkDerivation rec {

let

  # cemu doesn't build with imgui 1.90.2 or newer:

  # error: 'struct ImGuiIO' has no member named 'ImeWindowHandle'

  imgui' = imgui.overrideAttrs rec {

    version = "1.90.1";

    src = fetchFromGitHub {

      owner = "ocornut";

      repo = "imgui";

      rev = "v${version}";

      sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg=";

    };

  };



in stdenv.mkDerivation rec {

  pname = "cemu";

  version = "2.0-65";

  version = "2.0-66";



  src = fetchFromGitHub {

    owner = "cemu-project";

    repo = "Cemu";

    rev = "v${version}";

    hash = "sha256-jsDmxol3zZMmpo4whDeUXTzfO+QVK/h6lItXTyJyoak=";

    hash = "sha256-1s1H2rJuN9lRNanKXxKWMLBOFg5z3IwpJCZCmymAH9Y=";

  };



  patches = [
@@ -48,13 +60,6 @@ stdenv.mkDerivation rec { 
    # > The following imported targets are referenced, but are missing:

    # > SPIRV-Tools-opt

    ./cmakelists.patch



    # Remove on next release

    # https://github.com/cemu-project/Cemu/pull/1076

    (fetchpatch {

      url = "https://github.com/cemu-project/Cemu/commit/72aacbdcecc064ea7c3b158c433e4803496ac296.patch";

      hash = "sha256-x+ZVqXgGRSv0VYwJAX35C1p7PnmCHS7iEO+4k8j0/ug=";

    })

  ];



  nativeBuildInputs = [
@@ -75,7 +80,7 @@ stdenv.mkDerivation rec { 
    glm

    gtk3

    hidapi

    imgui

    imgui'

    libpng

    libusb1

    libzip
@@ -103,7 +108,7 @@ stdenv.mkDerivation rec { 
    tag = last (splitString "-" version);

  in ''

    rm -rf dependencies/imgui

    ln -s ${imgui}/include/imgui dependencies/imgui

    ln -s ${imgui'}/include/imgui dependencies/imgui

    substituteInPlace src/Common/version.h --replace " (experimental)" "-${tag} (experimental)"

    substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0"

  '';