From 32e70652392f3b6532a166f7bc6c5e3a2e3e99fe Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 22 May 2023 00:50:25 +0300 Subject: [PATCH 1/4] ueberzugpp: 2.8.3 -> 2.8.4 --- pkgs/tools/graphics/ueberzugpp/default.nix | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index cd9c5ca3e866..8cce38da7899 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -15,23 +15,36 @@ , nlohmann_json , libsixel , microsoft-gsl -, opencv -, xorg +, chafa , withOpencv ? stdenv.isLinux +, opencv , withX11 ? stdenv.isLinux +, xorg +, withoutStdRanges ? stdenv.isDarwin +, range-v3 }: stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-U6jw1VQmc/E/vXBCVvjBsmLjhVf0MFuK+FK8jnEEl1M="; + hash = "sha256-XWT6dFZx6kn6BAv7CV0YIiAuKSBOAfZr72gC9zrSxus="; }; + # 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 + sed -i "1i #include " $f + substituteInPlace $f \ + --replace "#include " "" \ + --replace "std::ranges" "ranges" + done + ''; + nativeBuildInputs = [ cmake pkg-config @@ -50,11 +63,14 @@ stdenv.mkDerivation rec { nlohmann_json libsixel microsoft-gsl + chafa ] ++ lib.optionals withOpencv [ opencv ] ++ lib.optionals withX11 [ xorg.libX11 xorg.xcbutilimage + ] ++ lib.optionals withoutStdRanges [ + range-v3 ]; cmakeFlags = lib.optionals (!withOpencv) [ From b388107dd5344389c7f5e6d38cc5a1aec4c678a1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 26 May 2023 14:27:45 +0300 Subject: [PATCH 2/4] ueberzugpp: 2.8.4 -> 2.8.5 --- pkgs/tools/graphics/ueberzugpp/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 8cce38da7899..4229283576e3 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -16,6 +16,8 @@ , libsixel , microsoft-gsl , chafa +, libuuid +, libossp_uuid , withOpencv ? stdenv.isLinux , opencv , withX11 ? stdenv.isLinux @@ -26,13 +28,13 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-XWT6dFZx6kn6BAv7CV0YIiAuKSBOAfZr72gC9zrSxus="; + hash = "sha256-WnrKwbh7m84xlKMuixkB8LLw8Pzb8+mZV9cHWiI6cBY="; }; # error: no member named 'ranges' in namespace 'std' @@ -64,6 +66,7 @@ stdenv.mkDerivation rec { libsixel microsoft-gsl chafa + (if stdenv.isLinux then libuuid else libossp_uuid) ] ++ lib.optionals withOpencv [ opencv ] ++ lib.optionals withX11 [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8dc0a4052c8..3dc841ec8b18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34794,7 +34794,7 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; - ueberzugpp = callPackage ../tools/graphics/ueberzugpp { }; + ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { }; uefi-run = callPackage ../tools/virtualization/uefi-run { }; From 7f9057a13336b98481df78973c40a51e76949d9e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 26 May 2023 14:52:47 +0300 Subject: [PATCH 3/4] ueberzugpp: adjust options --- pkgs/tools/graphics/ueberzugpp/default.nix | 26 ++++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 4229283576e3..6fcdb53f85b4 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -18,9 +18,13 @@ , chafa , libuuid , libossp_uuid -, withOpencv ? stdenv.isLinux +, enableOpencv ? stdenv.isLinux , opencv -, withX11 ? stdenv.isLinux +, enableSway ? stdenv.isLinux +, extra-cmake-modules +, wayland +, wayland-protocols +, enableX11 ? stdenv.isLinux , xorg , withoutStdRanges ? stdenv.isDarwin , range-v3 @@ -47,10 +51,11 @@ stdenv.mkDerivation rec { done ''; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config - cli11 ]; buildInputs = [ @@ -66,19 +71,26 @@ stdenv.mkDerivation rec { libsixel microsoft-gsl chafa + cli11 (if stdenv.isLinux then libuuid else libossp_uuid) - ] ++ lib.optionals withOpencv [ + ] ++ lib.optionals enableOpencv [ opencv - ] ++ lib.optionals withX11 [ + ] ++ lib.optionals enableSway [ + extra-cmake-modules + wayland + wayland-protocols + ] ++ lib.optionals enableX11 [ xorg.libX11 xorg.xcbutilimage ] ++ lib.optionals withoutStdRanges [ range-v3 ]; - cmakeFlags = lib.optionals (!withOpencv) [ + cmakeFlags = lib.optionals (!enableOpencv) [ "-DENABLE_OPENCV=OFF" - ] ++ lib.optionals (!withX11) [ + ] ++ lib.optionals enableSway [ + "-DENABLE_SWAY=ON" + ] ++ lib.optionals (!enableX11) [ "-DENABLE_X11=OFF" ]; From de87ba42c977b6487e48016286fea76afe327627 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 26 May 2023 14:54:09 +0300 Subject: [PATCH 4/4] ueberzugpp: drop mainProgram --- pkgs/tools/graphics/ueberzugpp/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 6fcdb53f85b4..70d51a142f48 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -99,11 +99,14 @@ stdenv.mkDerivation rec { export MACOSX_DEPLOYMENT_TARGET=10.14 ''; + postInstall = '' + ln -s $out/bin/ueberzug $out/bin/ueberzugpp + ''; + 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 wegank ]; platforms = platforms.unix; };