From f2de4779f74de8eff66f94c26f6a877f0535c450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 17:33:07 +0000 Subject: [PATCH 1/2] entt: 3.10.3 -> 3.11.0 --- pkgs/development/libraries/entt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 01d4b88246a8..306cdd52f476 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.10.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-pewAwvNRCBS6rm3AmHthiayGfP71lqkAO+x6rT957Xg="; + sha256 = "sha256-urB1oU4Riuo9+DKmMf317bqF4hTcm/zsSLn5fpZY27o="; }; nativeBuildInputs = [ cmake ]; From 3c77bae4c3c7c2530ef82f4d31e2e14eca722c00 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 20 Nov 2022 12:30:25 +0800 Subject: [PATCH 2/2] entt: remove unused substituteInPlace substituteStream(): WARNING: pattern '${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' doesn't match anything in file 'cmake/in/entt.pc.in' It looks like https://github.com/skypjack/entt/issues/890 has been resolved. --- pkgs/development/libraries/entt/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 306cdd52f476..6f8861086396 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -12,12 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - # https://github.com/skypjack/entt/issues/890 - postPatch = '' - substituteInPlace cmake/in/entt.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - meta = with lib; { homepage = "https://github.com/skypjack/entt"; description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++";