From 32e70652392f3b6532a166f7bc6c5e3a2e3e99fe Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 22 May 2023 00:50:25 +0300 Subject: [PATCH] ueberzugpp: 2.8.3 -> 2.8.4 --- pkgs/tools/graphics/ueberzugpp/default.nix | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index cd9c5ca3e866..8cce38da7899 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -15,23 +15,36 @@ , nlohmann_json , libsixel , microsoft-gsl -, opencv -, xorg +, chafa , withOpencv ? stdenv.isLinux +, opencv , withX11 ? stdenv.isLinux +, xorg +, withoutStdRanges ? stdenv.isDarwin +, range-v3 }: stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-U6jw1VQmc/E/vXBCVvjBsmLjhVf0MFuK+FK8jnEEl1M="; + hash = "sha256-XWT6dFZx6kn6BAv7CV0YIiAuKSBOAfZr72gC9zrSxus="; }; + # error: no member named 'ranges' in namespace 'std' + postPatch = lib.optionalString withoutStdRanges '' + for f in src/canvas/chafa.cpp src/canvas/iterm2/iterm2.cpp; do + sed -i "1i #include " $f + substituteInPlace $f \ + --replace "#include " "" \ + --replace "std::ranges" "ranges" + done + ''; + nativeBuildInputs = [ cmake pkg-config @@ -50,11 +63,14 @@ stdenv.mkDerivation rec { nlohmann_json libsixel microsoft-gsl + chafa ] ++ lib.optionals withOpencv [ opencv ] ++ lib.optionals withX11 [ xorg.libX11 xorg.xcbutilimage + ] ++ lib.optionals withoutStdRanges [ + range-v3 ]; cmakeFlags = lib.optionals (!withOpencv) [