diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-11 18:01:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-11 18:01:20 +0000 |
| commit | 7573d7fe79dff36b24606e695a935ce7f1337b4a (patch) | |
| tree | a1fa10a7ab747d7502dd35f94edfd3647f04bb49 /pkgs/tools/misc | |
| parent | e01403d0eb67e90daf452bbf4571957336046355 (diff) | |
| parent | f9335711ad5f6a980d4cebca25630210e41b1800 (diff) | |
| download | nixpkgs-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar nixpkgs-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.gz nixpkgs-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.bz2 nixpkgs-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.lz nixpkgs-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.xz nixpkgs-7573d7fe79dff36b24606e695a935ce7f1337b4a.tar.zst nixpkgs-7573d7fe79dff36b24606e695a935ce7f1337b4a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/gtkterm/default.nix | 42 | ||||
| -rw-r--r-- | pkgs/tools/misc/mc/default.nix | 3 |
2 files changed, 43 insertions, 2 deletions
diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/tools/misc/gtkterm/default.nix new file mode 100644 index 00000000000..08e5385288b --- /dev/null +++ b/pkgs/tools/misc/gtkterm/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "gtkterm"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "Jeija"; + repo = "gtkterm"; + rev = "${version}"; + sha256 = "0s2cx8w1n8d37pl80gll5h6dyvbqrfcam8l4wmvnqqww9jml6577"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + vte + libgudev + ]; + + meta = with lib; { + description = "A simple, graphical serial port terminal emulator"; + homepage = "https://github.com/Jeija/gtkterm"; + license = licenses.gpl3Plus; + longDescription = '' + GTKTerm is a simple, graphical serial port terminal emulator for + Linux and possibly other POSIX-compliant operating systems. It + can be used to communicate with all kinds of devices with a + serial interface, such as embedded computers, microcontrollers, + modems, GPS receivers, CNC machines and more. + ''; + maintainers = with maintainers; [ wentasah ]; + platforms = platforms.linux; + mainProgram = "gtkterm"; + }; +} diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 3b12175fb56..c2425cf94ca 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -46,14 +46,13 @@ stdenv.mkDerivation rec { libX11 libssh2 openssl - perl slang zip ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; - configureFlags = [ "--enable-vfs-smb" ]; + configureFlags = [ "--enable-vfs-smb" "PERL=${perl}/bin/perl" ]; postPatch = '' substituteInPlace src/filemanager/ext.c \ |