diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-07-19 13:55:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-19 13:55:13 +0300 |
| commit | 3fa49138c9e24841bc68f73e9fb80998d886abab (patch) | |
| tree | 27d900f8289b6e40b7f677bbb00e83bce22f59ad | |
| parent | 1bca3030f16eecaa528b8e95ffd4fbb2f72896ff (diff) | |
| parent | c0a57ce34fe2e503c789a52bfb25cc141bb516b3 (diff) | |
| download | nixpkgs-3fa49138c9e24841bc68f73e9fb80998d886abab.tar nixpkgs-3fa49138c9e24841bc68f73e9fb80998d886abab.tar.gz nixpkgs-3fa49138c9e24841bc68f73e9fb80998d886abab.tar.bz2 nixpkgs-3fa49138c9e24841bc68f73e9fb80998d886abab.tar.lz nixpkgs-3fa49138c9e24841bc68f73e9fb80998d886abab.tar.xz nixpkgs-3fa49138c9e24841bc68f73e9fb80998d886abab.tar.zst nixpkgs-3fa49138c9e24841bc68f73e9fb80998d886abab.zip | |
Merge pull request #244307 from wegank/ueberzugpp-bump
ueberzugpp: 2.8.8 -> 2.8.9
| -rw-r--r-- | pkgs/tools/graphics/ueberzugpp/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 3fa206d8866..a840209e652 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c56d676ec..682cee5a8da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |