lol

Merge pull request #232795 from wegank/ueberzugpp-bump

ueberzugpp: 2.8.1 -> 2.8.3

authored by

Weijia Wang and committed by
GitHub
4aafa10a e5c8528b

+12 -7
+12 -7
pkgs/tools/graphics/ueberzugpp/default.nix
··· 14 14 , vips 15 15 , nlohmann_json 16 16 , libsixel 17 + , microsoft_gsl 17 18 , opencv 18 19 , xorg 19 - , withOpencv ? true 20 - , withX11 ? true 20 + , withOpencv ? stdenv.isLinux 21 + , withX11 ? stdenv.isLinux 21 22 }: 22 23 23 - 24 24 stdenv.mkDerivation rec { 25 25 pname = "ueberzugpp"; 26 - version = "2.8.1"; 26 + version = "2.8.3"; 27 27 28 28 src = fetchFromGitHub { 29 29 owner = "jstkdng"; 30 30 repo = "ueberzugpp"; 31 31 rev = "v${version}"; 32 - hash = "sha256-9FGuElHWuqTuzHNcb9p0HX0AFMmZc+MRc5+EP5cvBaA="; 32 + hash = "sha256-U6jw1VQmc/E/vXBCVvjBsmLjhVf0MFuK+FK8jnEEl1M="; 33 33 }; 34 34 35 35 nativeBuildInputs = [ ··· 49 49 vips 50 50 nlohmann_json 51 51 libsixel 52 + microsoft_gsl 52 53 ] ++ lib.optionals withOpencv [ 53 54 opencv 54 55 ] ++ lib.optionals withX11 [ ··· 62 63 "-DENABLE_X11=OFF" 63 64 ]; 64 65 66 + # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.14 or newer 67 + preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' 68 + export MACOSX_DEPLOYMENT_TARGET=10.14 69 + ''; 70 + 65 71 meta = with lib; { 66 72 description = "Drop in replacement for ueberzug written in C++"; 67 73 homepage = "https://github.com/jstkdng/ueberzugpp"; 68 74 license = licenses.gpl3Plus; 69 75 mainProgram = "ueberzug"; 70 - maintainers = with maintainers; [ aleksana ]; 76 + maintainers = with maintainers; [ aleksana wegank ]; 71 77 platforms = platforms.unix; 72 - broken = stdenv.isDarwin; 73 78 }; 74 79 }