b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ueberzugpp: 2.8.8 -> 2.8.9

Browse source
This commit is contained in:
Weijia Wang 2023-07-19 13:13:41 +03:00
parent 4adde79832
commit c0a57ce34f
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/tools/graphics/ueberzugpp/default.nix
View file

@ -18,7 +18,7 @@
, chafa , chafa
, enableOpencv ? stdenv.isLinux , enableOpencv ? stdenv.isLinux
, opencv , opencv
, enableSway ? stdenv.isLinux , enableWayland ? stdenv.isLinux
, extra-cmake-modules , extra-cmake-modules
, wayland , wayland
, wayland-protocols , wayland-protocols
@ -30,19 +30,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ueberzugpp"; pname = "ueberzugpp";
version = "2.8.8"; version = "2.8.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jstkdng"; owner = "jstkdng";
repo = "ueberzugpp"; repo = "ueberzugpp";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-HvcH8ysH43i87so758m6QD+AuNfTiOdo5knI+3PBO8U="; hash = "sha256-RW2dKueidFM/RkGfOAorHukGVm1srbuAlyUP/r+JWi0=";
}; };
# error: no member named 'ranges' in namespace 'std' # error: no member named 'ranges' in namespace 'std'
postPatch = lib.optionalString withoutStdRanges '' 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 "1i #include <range/v3/algorithm/for_each.hpp>" $f
sed -i "2i #include <range/v3/algorithm/reverse.hpp>" $f
substituteInPlace $f \ substituteInPlace $f \
--replace "#include <ranges>" "" \ --replace "#include <ranges>" "" \
--replace "std::ranges" "ranges" --replace "std::ranges" "ranges"
@ -72,7 +73,7 @@ stdenv.mkDerivation rec {
cli11 cli11
] ++ lib.optionals enableOpencv [ ] ++ lib.optionals enableOpencv [
opencv opencv
] ++ lib.optionals enableSway [ ] ++ lib.optionals enableWayland [
extra-cmake-modules extra-cmake-modules
wayland wayland
wayland-protocols wayland-protocols
@ -85,8 +86,8 @@ stdenv.mkDerivation rec {
cmakeFlags = lib.optionals (!enableOpencv) [ cmakeFlags = lib.optionals (!enableOpencv) [
"-DENABLE_OPENCV=OFF" "-DENABLE_OPENCV=OFF"
] ++ lib.optionals enableSway [ ] ++ lib.optionals enableWayland [
"-DENABLE_SWAY=ON" "-DENABLE_WAYLAND=ON"
] ++ lib.optionals (!enableX11) [ ] ++ lib.optionals (!enableX11) [
"-DENABLE_X11=OFF" "-DENABLE_X11=OFF"
]; ];

4
pkgs/top-level/all-packages.nix
View file

@ -35454,7 +35454,9 @@ with pkgs;
ueberzug = with python3Packages; toPythonApplication ueberzug; 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 { }; uefi-run = callPackage ../tools/virtualization/uefi-run { };