diff options
author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
---|---|---|
committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
commit | 90c78aee6c04e0f3444a6b73344871a6e8ff9ea5 (patch) | |
tree | 0dd9562d2783db3223b20e66c55eba0b19ffabdd /pkgs/applications/terminal-emulators | |
parent | a1cd06f900febb73d1c4edb17685eec8499d6097 (diff) | |
parent | 33afbf39f6f2a6b37e99f070ba7d17a28c416d02 (diff) |
Merge branch 'nativeCheckInputs' into staging-nativeCheckInputs
Diffstat (limited to 'pkgs/applications/terminal-emulators')
-rw-r--r-- | pkgs/applications/terminal-emulators/blackbox-terminal/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/terminal-emulators/kitty/default.nix | 24 |
2 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 65b0274ca20dc..72ecca4ea488d 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -14,6 +14,7 @@ , pcre2 , libxml2 , librsvg +, libgee , callPackage , python3 , gtk3 @@ -26,14 +27,14 @@ let in stdenv.mkDerivation rec { pname = "blackbox"; - version = "0.12.2"; + version = "0.13.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "raggesilver"; repo = "blackbox"; rev = "v${version}"; - sha256 = "sha256-4/rtviBv5KXheLLExxOvaF0wU87eRKMNxlYCVxuIQgU="; + hash = "sha256-WeR7zdYdRWBR+kmxLjRFE6QII9RdBig7wrbVoCPA5go="; }; postPatch = '' @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { pcre2 libxml2 librsvg + libgee ]; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e1a3f00255eb0..aad2c367b91fd 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libunistring , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor , libxkbcommon, libXi, libXext, wayland-protocols, wayland @@ -7,14 +7,11 @@ , openssl , installShellFiles , dbus +, Libsystem , Cocoa -, CoreGraphics -, Foundation -, IOKit , Kernel , UniformTypeIdentifiers , UserNotifications -, OpenGL , libcanberra , libicns , libpng @@ -47,16 +44,14 @@ buildPythonApplication rec { openssl.dev ] ++ lib.optionals stdenv.isDarwin [ Cocoa - CoreGraphics - Foundation - IOKit Kernel - OpenGL UniformTypeIdentifiers UserNotifications libpng python3 zlib + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + Libsystem ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext @@ -80,6 +75,13 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ + # Fix clone-in-kitty not working on bash >= 5.2 + # TODO: Removed on kitty release > 0.26.5 + (fetchpatch { + url = "https://github.com/kovidgoyal/kitty/commit/51bba9110e9920afbefeb981e43d0c1728051b5e.patch"; + sha256 = "sha256-1aSU4aU6j1/om0LsceGfhH1Hdzp+pPaNeWAi7U6VcP4="; + }) + # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. ./fix-test_ssh_env_vars.patch @@ -110,6 +112,7 @@ buildPythonApplication rec { ''; in '' runHook preBuild + ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' ${python.interpreter} setup.py build ${darwinOptions} make docs @@ -126,7 +129,7 @@ buildPythonApplication rec { runHook postBuild ''; - checkInputs = [ + nativeCheckInputs = [ pillow # Shells needed for shell integration tests @@ -219,7 +222,6 @@ buildPythonApplication rec { license = licenses.gpl3Only; changelog = "https://sw.kovidgoyal.net/kitty/changelog/"; platforms = platforms.darwin ++ platforms.linux; - broken = (stdenv.isDarwin && stdenv.isx86_64); maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ]; }; } |