From 87a64c39798ca8d65a37524a121ddc5e0ce33c47 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 19 May 2023 15:04:51 +0300 Subject: [PATCH] ueberzugpp: 2.8.1 -> 2.8.3 --- pkgs/tools/graphics/ueberzugpp/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index e3c83456531c..41b707ba51c1 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -14,22 +14,22 @@ , vips , nlohmann_json , libsixel +, microsoft_gsl , opencv , xorg -, withOpencv ? true -, withX11 ? true +, withOpencv ? stdenv.isLinux +, withX11 ? stdenv.isLinux }: - stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.8.1"; + version = "2.8.3"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-9FGuElHWuqTuzHNcb9p0HX0AFMmZc+MRc5+EP5cvBaA="; + hash = "sha256-U6jw1VQmc/E/vXBCVvjBsmLjhVf0MFuK+FK8jnEEl1M="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { vips nlohmann_json libsixel + microsoft_gsl ] ++ lib.optionals withOpencv [ opencv ] ++ lib.optionals withX11 [ @@ -62,13 +63,17 @@ stdenv.mkDerivation rec { "-DENABLE_X11=OFF" ]; + # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.14 or newer + preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' + export MACOSX_DEPLOYMENT_TARGET=10.14 + ''; + meta = with lib; { description = "Drop in replacement for ueberzug written in C++"; homepage = "https://github.com/jstkdng/ueberzugpp"; license = licenses.gpl3Plus; mainProgram = "ueberzug"; - maintainers = with maintainers; [ aleksana ]; + maintainers = with maintainers; [ aleksana wegank ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; }