fix lock file, fix mirism build

This commit is contained in:
2025-10-04 12:07:34 +08:00
parent 0be4b8f782
commit 6df8681fe1
5 changed files with 43 additions and 15 deletions

View File

@@ -23,14 +23,11 @@ inputs: rec
nameof = inputs.pkgs.callPackage ./nameof.nix { src = inputs.topInputs.nameof; };
pslist = inputs.pkgs.callPackage ./pslist.nix { src = inputs.topInputs.self.src.pslist; };
tgbot-cpp = inputs.pkgs.callPackage ./tgbot-cpp.nix { src = inputs.topInputs.tgbot-cpp; };
mirism-old = inputs.pkgs.callPackage ./mirism-old.nix
mirism-old = inputs.pkgs.pkgs-2305.callPackage ./mirism-old.nix
{
inherit cppcoro nameof date;
inherit (inputs.pkgs.pkgs-2305) boost;
src = inputs.topInputs.self.src.mirism-old;
src = inputs.topInputs.mirism-old;
nghttp2 = inputs.pkgs.pkgs-2305.nghttp2.override { enableAsioLib = true; };
stdenv = inputs.pkgs.pkgs-2305.stdenv;
tgbot-cpp = tgbot-cpp.override { inherit (inputs.pkgs.pkgs-2305) stdenv; };
};
cppcoro = inputs.pkgs.callPackage ./cppcoro { src = inputs.topInputs.cppcoro; };
date = inputs.pkgs.callPackage ./date.nix { src = inputs.topInputs.date; };

View File

@@ -1,11 +1,11 @@
{
lib, stdenv, requireFile, src,
boost, nghttp2, brotli, nameof, cppcoro, tgbot-cpp, libbacktrace, fmt, date
boost, nghttp2, brotli, nameof, cppcoro, libbacktrace, fmt, date, openssl
}: stdenv.mkDerivation
{
name = "mirism";
inherit src;
buildInputs = [ boost nghttp2.dev brotli nameof cppcoro tgbot-cpp libbacktrace fmt date ];
buildInputs = [ boost nghttp2 brotli nameof cppcoro libbacktrace fmt date openssl ];
buildPhase =
''
runHook preBuild