Unverified Commit 9c8b5395 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

Cemu: 2.0-92 -> 2.2 (#353870)

parents 336f37fa cd31998d

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -2351,7 +2351,7 @@ 
    email = "baduhai@pm.me";

    github = "baduhai";

    githubId = 31864305;

    name = "William";

    name = "William Hai";

  };

  baitinq = {

    email = "manuelpalenzuelamerino@gmail.com";

pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch

+2 −2
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 4b2b789..48d9be0 100644

index 54e2012..a9b6b0e 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -92,6 +92,7 @@ find_package(pugixml REQUIRED)

@@ -149,6 +149,7 @@ find_package(pugixml REQUIRED)

 find_package(RapidJSON REQUIRED)

 find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED)

 find_package(libzip REQUIRED)

pkgs/by-name/ce/cemu/0001-glslang-cmake-target.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/src/Cafe/CMakeLists.txt.orig b/src/Cafe/CMakeLists.txt

index 91d257b..cff779a 100644

--- a/src/Cafe/CMakeLists.txt

+++ b/src/Cafe/CMakeLists.txt

@@ -545,7 +545,7 @@ target_link_libraries(CemuCafe PRIVATE

	Boost::nowide

	CURL::libcurl

	fmt::fmt

-	glslang::SPIRV

+	glslang::glslang

	ih264d

	OpenSSL::Crypto

	OpenSSL::SSL

pkgs/by-name/ce/cemu/package.nix

+33 −20
Original line number Diff line number Diff line
@@ -47,15 +47,16 @@ let 
      hash = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg=";

    };

  };

in stdenv.mkDerivation (finalAttrs: {

in

stdenv.mkDerivation (finalAttrs: {

  pname = "cemu";

  version = "2.0-92";

  version = "2.2";



  src = fetchFromGitHub {

    owner = "cemu-project";

    repo = "Cemu";

    rev = "v${finalAttrs.version}";

    hash = "sha256-bjt+2RzmG8iKcdyka4HsHM5NEzCwGah4s9eiywSHXbw=";

    hash = "sha256-d4FMAj99SPj5S1p5nAUFNo386ZJvWxOKD9iGxHJYVBI=";

  };



  patches = [
@@ -63,6 +64,7 @@ in stdenv.mkDerivation (finalAttrs: { 
    # > The following imported targets are referenced, but are missing:

    # > SPIRV-Tools-opt

    ./0000-spirv-tools-opt-cmakelists.patch

    ./0001-glslang-cmake-target.patch

  ];



  nativeBuildInputs = [
@@ -113,13 +115,18 @@ in stdenv.mkDerivation (finalAttrs: { 


  strictDeps = true;



  preConfigure = let

    tag = lib.last (lib.splitString "-" finalAttrs.version);

  in ''

  preConfigure =

    let

      tag = lib.splitString "." (lib.last (lib.splitString "-" finalAttrs.version));

      majorv = builtins.elemAt tag 0;

      minorv = builtins.elemAt tag 1;

    in

    ''

      rm -rf dependencies/imgui

      # cemu expects imgui source code, not just header files

      ln -s ${imgui'.src} dependencies/imgui

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

      substituteInPlace CMakeLists.txt --replace-fail "EMULATOR_VERSION_MAJOR \"0\"" "EMULATOR_VERSION_MAJOR \"${majorv}\""

      substituteInPlace CMakeLists.txt --replace-fail "EMULATOR_VERSION_MINOR \"0\"" "EMULATOR_VERSION_MINOR \"${minorv}\""

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

    '';
@@ -139,9 +146,11 @@ in stdenv.mkDerivation (finalAttrs: { 
    runHook postInstall

  '';



  preFixup = let

  preFixup =

    let

      libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs;

  in ''

    in

    ''

      gappsWrapperArgs+=(

        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}"

      )
@@ -161,7 +170,11 @@ in stdenv.mkDerivation (finalAttrs: { 
    homepage = "https://cemu.info";

    license = lib.licenses.mpl20;

    mainProgram = "cemu";

    maintainers = with lib.maintainers; [ zhaofengli baduhai AndersonTorres ];

    maintainers = with lib.maintainers; [

      zhaofengli

      baduhai

      AndersonTorres

    ];

    platforms = [ "x86_64-linux" ];

  };

})