Unverified Commit 32fac970 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #289927 from wegank/performous-bump 

performous: 1.3.0 -> 1.3.1
parents 18afb06b 566a57c3

pkgs/games/performous/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 


stdenv.mkDerivation rec {

  pname = "performous";

  version = "1.3.0";

  version = "1.3.1";



  src = fetchFromGitHub {

    owner = "performous";

    repo = "performous";

    rev = "refs/tags/${version}";

    hash = "sha256-y7kxLht15vULN9NxM0wzj9+7Uq4/3D5j9oBEnrTIwQ8=";

    hash = "sha256-f70IHA8LqIlkMRwJqSmszx3keStSx50nKcEWLGEjc3g=";

  };



  cedSrc = fetchFromGitHub {

pkgs/games/performous/performous-cmake.patch

+15 −14
Original line number Diff line number Diff line 
diff --git a/cmake/Modules/FindCed.cmake b/cmake/Modules/FindCed.cmake

index d6e2aca..3085adb 100644

index 5794bc84..08d6b49d 100644

--- a/cmake/Modules/FindCed.cmake

+++ b/cmake/Modules/FindCed.cmake

@@ -1,11 +1 @@

-include(LibFetchMacros)

-

-set(Ced_GIT_VERSION "master")

-

@@ -22,12 +22,7 @@ elseif(SELF_BUILT_CED STREQUAL "AUTO")

 	pkg_check_modules(CED IMPORTED_TARGET GLOBAL CED)

 	if(NOT CED_FOUND)

 		message(STATUS "ced build from source because not found on system")

-		libfetch_git_pkg(Ced

-			REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git

-			#https://github.com/google/compact_enc_det.git

-			REFERENCE  ${Ced_GIT_VERSION}

-			FIND_PATH  compact_enc_det/compact_enc_det.h

-		)

-message(STATUS "Found Google CED ${Ced_VERSION}")

+		add_subdirectory(../ced-src ced-src)

 	else()

 		add_library(ced ALIAS PkgConfig::CED)

 		set(Ced_VERSION ${CED_VERSION})