diff options
author | Maciej Krüger <mkg20001@gmail.com> | 2023-09-12 14:46:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-12 14:46:08 +0200 |
commit | a4dde5a1a96cb6d3f6a5fd2c4982419764243dd1 (patch) | |
tree | d1b30372bcf8754b76d0508eb3853c452835d3e4 /pkgs/applications/terminal-emulators | |
parent | 49f1b36299f24a9c61e74a885dceb48bef06f539 (diff) | |
parent | c5de4a5be3d54436d8cdf2deb3f40dd7c52ddea6 (diff) |
Merge pull request #253334 from nbraud/nixos/terminfo
Diffstat (limited to 'pkgs/applications/terminal-emulators')
-rw-r--r-- | pkgs/applications/terminal-emulators/contour/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/terminal-emulators/st/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/terminal-emulators/yaft/default.nix | 8 |
3 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index c1eba0e3fe456..9c44946f38269 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -47,6 +47,8 @@ mkDerivation rec { sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4="; }; + outputs = [ "out" "terminfo" ]; + nativeBuildInputs = [ cmake pkg-config @@ -86,6 +88,12 @@ mkDerivation rec { sed -i '/fixup_bundle/d' src/contour/CMakeLists.txt ''; + postInstall = '' + mkdir -p $out/nix-support $terminfo/share + mv $out/share/terminfo $terminfo/share/ + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + passthru.tests.test = nixosTests.terminal-emulators.contour; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index da48550877c7d..9856d1428f971 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc="; }; + outputs = [ "out" "terminfo" ]; + inherit patches; configFile = lib.optionalString (conf != null) @@ -51,7 +53,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ extraLibs; preInstall = '' - export TERMINFO=$out/share/terminfo + export TERMINFO=$terminfo/share/terminfo + mkdir -p $TERMINFO $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages ''; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/terminal-emulators/yaft/default.nix b/pkgs/applications/terminal-emulators/yaft/default.nix index 5471ee45e0a3c..c38d90bd4043b 100644 --- a/pkgs/applications/terminal-emulators/yaft/default.nix +++ b/pkgs/applications/terminal-emulators/yaft/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { version = "0.2.9"; pname = "yaft"; + outputs = [ "out" "terminfo" ]; + src = fetchFromGitHub { owner = "uobikiemukot"; repo = "yaft"; @@ -15,6 +17,12 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; + postInstall = '' + mkdir -p $out/nix-support $terminfo/share + mv $out/share/terminfo $terminfo/share/ + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + meta = { homepage = "https://github.com/uobikiemukot/yaft"; description = "Yet another framebuffer terminal"; |