diff options
Diffstat (limited to 'pkgs/applications/terminal-emulators')
6 files changed, 89 insertions, 25 deletions
diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix new file mode 100644 index 00000000000..864a9e7c487 --- /dev/null +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -0,0 +1,27 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre }: + +mkDerivation rec { + pname = "contour"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "christianparpart"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-P7t+M75ZWjFcGWngcbaurdit6e+pb0ILljimhYqW0NI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ freetype libGL pcre ]; + + meta = with lib; { + description = "Modern C++ Terminal Emulator"; + homepage = "https://github.com/christianparpart/contour"; + changelog = "https://github.com/christianparpart/contour/blob/HEAD/Changelog.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fortuneteller2k ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 5062329834c..46d3c6c97c7 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -15,7 +15,9 @@ , scdoc , tllist , wayland-protocols +, wayland-scanner , pkg-config +, utf8proc , allowPgo ? true , python3 # for PGO # for clang stdenv check @@ -25,7 +27,7 @@ }: let - version = "1.7.2"; + version = "1.8.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -39,7 +41,7 @@ let src = fetchurl { url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; - sha256 = "019bdiqfi3wx2lwrv3nhq83knc1r3lmqd5zgisa33wwshm2kyv7p"; + sha256 = "0w4d0rxi54p8lvbynypcywqqwbbzmyyzc0svjab27ngmdj1034ii"; }; dontUnpack = true; @@ -76,7 +78,7 @@ let }."${compilerName}"; # ar with lto support - ar = { + ar = stdenv.cc.bintools.targetPrefix + { "clang" = "llvm-ar"; "gcc" = "gcc-ar"; "unknown" = "ar"; @@ -93,28 +95,34 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "0iabj9c0dj1r0m89i5gk2jdmwj4wfsai8na54x2w4fq406q6g9nh"; + sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989"; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + wayland-scanner meson ninja ncurses scdoc - tllist - wayland-protocols pkg-config ] ++ lib.optionals (compilerName == "clang") [ stdenv.cc.cc.libllvm.out ]; buildInputs = [ + tllist + wayland-protocols fontconfig freetype pixman wayland libxkbcommon fcft + utf8proc ]; # recommended build flags for performance optimized foot builds @@ -129,7 +137,11 @@ stdenv.mkDerivation rec { export AR="${ar}" ''; - mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; + mesonFlags = [ + "--buildtype=release" + "-Db_lto=true" + "-Dterminfo-install-location=${placeholder "terminfo"}/share/terminfo" + ]; # build and run binary generating PGO profiles, # then reconfigure to build the normal foot binary utilizing PGO @@ -146,6 +158,15 @@ stdenv.mkDerivation rec { llvm-profdata merge default_*profraw --output=default.profdata ''; + outputs = [ "out" "terminfo" ]; + + # make sure nix-env and buildEnv also include the + # terminfo output when the package is installed + postInstall = '' + mkdir -p "$out/nix-support" + echo "$terminfo" >> "$out/nix-support/propagated-user-env-packages" + ''; + passthru.tests = { clang-default-compilation = foot.override { inherit (llvmPackages) stdenv; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 62cb6707c1b..8c4c6b383d5 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -9,7 +9,7 @@ , libnotify , libutempter , vte -, libwnck3 +, libwnck }: python3.pkgs.buildPythonApplication rec { @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 keybinder3 libnotify - libwnck3 + libwnck python3 vte ]; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e101d5d3a8c..441c9904c07 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.21.1"; + version = "0.21.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-/+OSVjC4++A4kaxEfI2kIgjXxL67lfoXCdH2PykLWxA="; + sha256 = "0y0mg8rr18mn0wzym7v48x6kl0ixd5q387kr5jhbdln55ph2jk9d"; }; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index af56f54a414..fbebf6590d0 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,30 +1,41 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , cmake -, pkg-config +, glib , gtk3 +, makeWrapper +, pcre2 , perl +, pkg-config , vte -, pcre2 -, glib -, makeWrapper }: stdenv.mkDerivation rec { pname = "sakura"; - version = "3.7.1"; + version = "3.8.2"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; + sha256 = "sha256-nd/okZrg4RZzyiKHmuMkVl0Jh7FOlI4dK63/U4/htbk="; }; - nativeBuildInputs = [ cmake perl pkg-config makeWrapper ]; + nativeBuildInputs = [ + cmake + makeWrapper + perl + pkg-config + ]; - buildInputs = [ gtk3 vte pcre2 glib ]; + buildInputs = [ + glib + gtk3 + pcre2 + vte + ]; - # Set path to gsettings-schemata so sakura knows - # where to find colorchooser, fontchooser etc. + # Set path to gsettings-schemata so sakura knows where to find colorchooser, + # fontchooser etc. postInstall = '' wrapProgram $out/bin/sakura \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index a5db5065707..eafa8930371 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "07y51l06n344pjyxdddq6sdvxw25nl10irl4avynkqjnqyqsiw97"; }; + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + pkg-config + fontconfig + ]; + buildInputs = [ xorg.libXaw xorg.xorgproto @@ -24,11 +32,8 @@ stdenv.mkDerivation rec { xorg.libICE ncurses freetype - fontconfig - pkg-config xorg.libXft xorg.luit - makeWrapper ]; patches = [ ./sixel-256.support.patch ] |