Unverified Commit e9fad199 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

cemu: 2.5 -> 2.6 (#397456)

parents 273b3579 9edbaf79

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

deleted100644 → 0
+0 −13
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

+4 −11
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
  cubeb,

  curl,

  fetchFromGitHub,

  fetchpatch,

  fmt_9,

  gamemode,

  glm,
@@ -45,20 +44,20 @@ let 
    src = fetchFromGitHub {

      owner = "ocornut";

      repo = "imgui";

      rev = "v${version}";

      tag = "v${version}";

      hash = "sha256-J4gz4rnydu8JlzqNC/OIoVoRcgeFd6B1Qboxu5drOKY=";

    };

  };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "cemu";

  version = "2.5";

  version = "2.6";



  src = fetchFromGitHub {

    owner = "cemu-project";

    repo = "Cemu";

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

    hash = "sha256-JBd5ntU1fFDvQpNbfP63AQANzuQTdfd4dfB29/BN5LM=";

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

    hash = "sha256-YO3rMhlBZ5fGu0ceAFB0R3owFuSobx39faWL9EUFwAM=";

  };



  patches = [
@@ -66,12 +65,6 @@ 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

    (fetchpatch {

      name = "fix-building-against-boost-187.patch";

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

      hash = "sha256-jHB/9MWZ/oNfUgZtxtgkSN/OnRARSuGVfXFFB9ldDpI=";

    })

    ./0002-cemu-imgui.patch

  ];