diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-09-21 17:36:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-21 17:36:18 +0200 |
| commit | 1b1e09e8d34d89d8ecf1f6e775076f2f34605c09 (patch) | |
| tree | 015cbfad6fdd14959e1cc60d88f28ee9c5f12f00 | |
| parent | sourceHighlight: fix tests with llvm (#329993) (diff) | |
| parent | zutty: init at 0.16-unstable-2024-08-18 (diff) | |
| download | nixpkgs-1b1e09e8d34d89d8ecf1f6e775076f2f34605c09.tar.gz | |
zutty: init at 0.16-unstable-2024-08-18 (#336255)
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/terminal-emulators.nix | 2 | ||||
| -rw-r--r-- | pkgs/by-name/zu/zutty/package.nix | 59 |
3 files changed, 67 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ed9383d5e04..40ab1b6aabd1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18080,6 +18080,12 @@ githubId = 17805516; name = "Rohan Rao"; }; + rolfschr = { + email = "rolf.schr@posteo.de"; + github = "rolfschr"; + githubId = 1188465; + name = "Rolf Schröder"; + }; rollf = { email = "rolf.schroeder@limbus-medtec.com"; github = "rollf"; diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index c72b1c390e8c..9195f619c8d2 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -120,6 +120,8 @@ let tests = { xfce4-terminal.pkg = p: p.xfce.xfce4-terminal; xterm.pkg = p: p.xterm; + + zutty.pkg = p: p.zutty; }; in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest { diff --git a/pkgs/by-name/zu/zutty/package.nix b/pkgs/by-name/zu/zutty/package.nix new file mode 100644 index 000000000000..4a931a1c4eb0 --- /dev/null +++ b/pkgs/by-name/zu/zutty/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchgit, + pkg-config, + freetype, + wafHook, + python3, + libXmu, + glew, + ucs-fonts, + nixosTests, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "zutty"; + version = "0.16-unstable-2024-08-18"; + + src = fetchgit { + url = "https://git.hq.sig7.se/zutty.git"; + rev = "04b2ca3b3aaa070c41583247f8112c31b6003886"; # 20240818 + hash = "sha256-izUbn2B3RqIIOW9tuL7DFLqJdektCftxnpQssJMYxC8="; + }; + + postPatch = + let + fontpaths = [ + "/run/current-system/sw/share/X11/fonts" # available if fonts.fontDir.enable = true + "${ucs-fonts}/share/fonts" + ]; + in + '' + substituteInPlace src/options.h \ + --replace-fail /usr/share/fonts ${builtins.concatStringsSep ":" fontpaths} + ''; + + nativeBuildInputs = [ + pkg-config + wafHook + python3 + ]; + + buildInputs = [ + freetype + libXmu + glew + ]; + + passthru = { + tests = lib.optionalAttrs stdenv.isLinux { default = nixosTests.terminal-emulators.zutty; }; + }; + + meta = { + homepage = "https://tomscii.sig7.se/zutty/"; + description = "X terminal emulator rendering through OpenGL ES Compute Shaders"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.rolfschr ]; + platforms = lib.platforms.linux; + }; +}) |