Unverified Commit 3fa49138 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #244307 from wegank/ueberzugpp-bump 

ueberzugpp: 2.8.8 -> 2.8.9
parents 1bca3030 c0a57ce3

pkgs/tools/graphics/ueberzugpp/default.nix

+8 −7
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
, chafa

, enableOpencv ? stdenv.isLinux

, opencv

, enableSway ? stdenv.isLinux

, enableWayland ? stdenv.isLinux

, extra-cmake-modules

, wayland

, wayland-protocols
@@ -30,19 +30,20 @@ 


stdenv.mkDerivation rec {

  pname = "ueberzugpp";

  version = "2.8.8";

  version = "2.8.9";



  src = fetchFromGitHub {

    owner = "jstkdng";

    repo = "ueberzugpp";

    rev = "v${version}";

    hash = "sha256-HvcH8ysH43i87so758m6QD+AuNfTiOdo5knI+3PBO8U=";

    hash = "sha256-RW2dKueidFM/RkGfOAorHukGVm1srbuAlyUP/r+JWi0=";

  };



  # 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

    for f in src/canvas/chafa.cpp src/canvas/iterm2/iterm2.cpp src/terminal.cpp; do

      sed -i "1i #include <range/v3/algorithm/for_each.hpp>" $f

      sed -i "2i #include <range/v3/algorithm/reverse.hpp>" $f

      substituteInPlace $f \

        --replace "#include <ranges>" "" \

        --replace "std::ranges" "ranges"
@@ -72,7 +73,7 @@ stdenv.mkDerivation rec { 
    cli11

  ] ++ lib.optionals enableOpencv [

    opencv

  ] ++ lib.optionals enableSway [

  ] ++ lib.optionals enableWayland [

    extra-cmake-modules

    wayland

    wayland-protocols
@@ -85,8 +86,8 @@ stdenv.mkDerivation rec { 


  cmakeFlags = lib.optionals (!enableOpencv) [

    "-DENABLE_OPENCV=OFF"

  ] ++ lib.optionals enableSway [

    "-DENABLE_SWAY=ON"

  ] ++ lib.optionals enableWayland [

    "-DENABLE_WAYLAND=ON"

  ] ++ lib.optionals (!enableX11) [

    "-DENABLE_X11=OFF"

  ];

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -35449,7 +35449,9 @@ with pkgs; 














  ueberzug = with python3Packages; toPythonApplication ueberzug;



























  ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { };













  ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp {













    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv;













  };





























  uefi-run = callPackage ../tools/virtualization/uefi-run { };