Commit 1b3bdf7f authored by Weijia Wang's avatar Weijia Wang
Browse files

performous: 1.2.0 -> 1.3.0

parent c49f338a

pkgs/games/performous/default.nix

+14 −8
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
, aubio

, boost

, cmake

, ffmpeg_4

, ffmpeg

, fmt

, gettext

, git

, glew

, glibmm

, glm
@@ -15,6 +15,7 @@ 
, libepoxy

, librsvg

, libxmlxx

, nlohmann_json

, pango

, pkg-config

, portaudio
@@ -22,17 +23,17 @@ 


stdenv.mkDerivation rec {

  pname = "performous";

  version = "1.2.0";

  version = "1.3.0";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    owner = "performous";

    repo = "performous";

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

    hash = "sha256-ueTSirov/lj4/IzaMqHitbOqx8qqUpsTghcb9DUnNEg=";

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

  };



  cedSrc = fetchFromGitHub {

    owner = pname;

    owner = "performous";

    repo = "compact_enc_det";

    rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e";

    hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec=";
@@ -46,6 +47,9 @@ stdenv.mkDerivation rec { 
  postPatch = ''

    mkdir ced-src

    cp -R ${cedSrc}/* ced-src



    substituteInPlace data/CMakeLists.txt \

      --replace "/usr" "$out"

  '';



  nativeBuildInputs = [
@@ -58,7 +62,8 @@ stdenv.mkDerivation rec { 
    SDL2

    aubio

    boost

    ffmpeg_4

    ffmpeg

    fmt

    glew

    glibmm

    glm
@@ -66,6 +71,7 @@ stdenv.mkDerivation rec { 
    libepoxy

    librsvg

    libxmlxx

    nlohmann_json

    pango

    portaudio

  ];

pkgs/games/performous/performous-cmake.patch

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

index 48af2a89..43786c31 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -75,15 +75,7 @@ else()

 	message(STATUS "Localization disabled: Gettext tools (msgfmt) missing")

 endif()

 

-include(FetchContent)

-FetchContent_Declare(ced-sources

-  GIT_REPOSITORY https://github.com/performous/compact_enc_det.git

diff --git a/cmake/Modules/FindCed.cmake b/cmake/Modules/FindCed.cmake

index d6e2aca..3085adb 100644

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

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

@@ -1,11 +1 @@

-include(LibFetchMacros)

-

-set(Ced_GIT_VERSION "master")

-

-libfetch_git_pkg(Ced

-	REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git

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

-  GIT_TAG        master

-  SOURCE_DIR ced-src

-	REFERENCE  ${Ced_GIT_VERSION}

-	FIND_PATH  compact_enc_det/compact_enc_det.h

-)

-

-FetchContent_MakeAvailable(ced-sources)

+add_subdirectory(ced-src)

 

 option(USE_SELF_BUILT_AUBIO "Use custom aubio local build instead of using system lib (if available)" FALSE)

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

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