about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2022-01-25 10:34:40 +0100
committerGitHub <noreply@github.com>2022-01-25 10:34:40 +0100
commit5cbff8a564ddd6d40a2e39b43895e06afbb270f7 (patch)
treec84d2034a99fe5f1a810d3e592b694a5b7fb4743
parent8a5e9ef604ef32048891adb0649c68cf8f3c528e (diff)
parent7fc56a03f0f093b047b55fed3461b0117d8e63e6 (diff)
downloadnixlib-5cbff8a564ddd6d40a2e39b43895e06afbb270f7.tar
nixlib-5cbff8a564ddd6d40a2e39b43895e06afbb270f7.tar.gz
nixlib-5cbff8a564ddd6d40a2e39b43895e06afbb270f7.tar.bz2
nixlib-5cbff8a564ddd6d40a2e39b43895e06afbb270f7.tar.lz
nixlib-5cbff8a564ddd6d40a2e39b43895e06afbb270f7.tar.xz
nixlib-5cbff8a564ddd6d40a2e39b43895e06afbb270f7.tar.zst
nixlib-5cbff8a564ddd6d40a2e39b43895e06afbb270f7.zip
Merge pull request #156604 from rnhmjoj/pr-rxvt
-rw-r--r--pkgs/applications/terminal-emulators/rxvt-unicode/default.nix6
-rw-r--r--pkgs/development/libraries/libptytty/default.nix26
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 32 insertions, 2 deletions
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index 2c130bf02d3e..70ff4a4555d7 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@@ -2,6 +2,7 @@
 , libX11, libXt, libXft, libXrender
 , ncurses, fontconfig, freetype
 , pkg-config, gdk-pixbuf, perl
+, libptytty
 , perlSupport      ? true
 , gdkPixbufSupport ? true
 , unicode3Support  ? true
@@ -9,7 +10,7 @@
 
 let
   pname = "rxvt-unicode";
-  version = "9.26";
+  version = "9.30";
   description = "A clone of the well-known terminal emulator rxvt";
 
   desktopItem = makeDesktopItem {
@@ -31,12 +32,13 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
-    sha256 = "12y9p32q0v7n7rhjla0j2g9d5rj2dmwk20c9yhlssaaxlawiccb4";
+    sha256 = "0badnkjsn3zps24r5iggj8k5v4f00npc77wqg92pcn1q5z8r677y";
   };
 
   buildInputs =
     [ libX11 libXt libXft ncurses  # required to build the terminfo file
       fontconfig freetype pkg-config libXrender
+      libptytty
     ] ++ optional perlSupport perl
       ++ optional gdkPixbufSupport gdk-pixbuf;
 
diff --git a/pkgs/development/libraries/libptytty/default.nix b/pkgs/development/libraries/libptytty/default.nix
new file mode 100644
index 000000000000..63f50de287c6
--- /dev/null
+++ b/pkgs/development/libraries/libptytty/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, lib
+, fetchurl
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libptytty";
+  version = "2.0";
+
+  src = fetchurl {
+    url = "http://dist.schmorp.de/libptytty/${pname}-${version}.tar.gz";
+    sha256 = "1xrikmrsdkxhdy9ggc0ci6kg5b1hn3bz44ag1mk5k1zjmlxfscw0";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    description = "OS independent and secure pty/tty and utmp/wtmp/lastlog";
+    homepage = "http://dist.schmorp.de/libptytty";
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms = platforms.unix;
+    license = licenses.gpl2;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d61e9a13bb88..3e15190d837d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18417,6 +18417,8 @@ with pkgs;
 
   libpst = callPackage ../development/libraries/libpst { };
 
+  libptytty = callPackage ../development/libraries/libptytty { };
+
   libpwquality = callPackage ../development/libraries/libpwquality { };
 
   libqalculate = callPackage ../development/libraries/libqalculate {