From b96dda6f0892ee55f02e2c6828c2bb00340655bf Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 1 Jun 2025 12:47:40 +0800 Subject: [PATCH] packages.mirism-old: fix --- packages/default.nix | 7 ++++--- packages/tgbot-cpp.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/default.nix b/packages/default.nix index 91b8835a..e6ea5cd3 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -26,11 +26,12 @@ inputs: rec tgbot-cpp = inputs.pkgs.callPackage ./tgbot-cpp.nix { src = inputs.topInputs.tgbot-cpp; }; mirism-old = inputs.pkgs.callPackage ./mirism-old.nix { - inherit cppcoro nameof tgbot-cpp date; + inherit cppcoro nameof date; + inherit (inputs.pkgs.pkgs-2305) boost; src = inputs.topInputs.self.src.mirism-old; - nghttp2 = inputs.pkgs.callPackage "${inputs.topInputs.nixpkgs-2305}/pkgs/development/libraries/nghttp2" - { enableAsioLib = true; stdenv = inputs.pkgs.gcc12Stdenv; }; + nghttp2 = inputs.pkgs.pkgs-2305.nghttp2.override { enableAsioLib = true; }; stdenv = inputs.pkgs.gcc12Stdenv; + tgbot-cpp = tgbot-cpp.override { stdenv = inputs.pkgs.gcc12Stdenv; }; }; cppcoro = inputs.pkgs.callPackage ./cppcoro { src = inputs.topInputs.cppcoro; }; date = inputs.pkgs.callPackage ./date.nix { src = inputs.topInputs.date; }; diff --git a/packages/tgbot-cpp.nix b/packages/tgbot-cpp.nix index 16689381..4b008b05 100644 --- a/packages/tgbot-cpp.nix +++ b/packages/tgbot-cpp.nix @@ -4,5 +4,6 @@ inherit src; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost openssl zlib curl ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; propagatedBuildInputs = buildInputs; }