diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-11-13 15:30:01 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-11-13 15:30:01 +0000 |
| commit | 26b89bcd160762633732251061ac29723da9b2b5 (patch) | |
| tree | cab28af5ae43126195be9fdfbee2fba3399c3a69 /pkgs/applications/terminal-emulators/roxterm/default.nix | |
| parent | 25da6bdd4157c31cb107188078bb12622a1c567d (diff) | |
| parent | 631c3d7cb2be3267aae75035600d0b2074ea8248 (diff) | |
| download | nixpkgs-26b89bcd160762633732251061ac29723da9b2b5.tar nixpkgs-26b89bcd160762633732251061ac29723da9b2b5.tar.gz nixpkgs-26b89bcd160762633732251061ac29723da9b2b5.tar.bz2 nixpkgs-26b89bcd160762633732251061ac29723da9b2b5.tar.lz nixpkgs-26b89bcd160762633732251061ac29723da9b2b5.tar.xz nixpkgs-26b89bcd160762633732251061ac29723da9b2b5.tar.zst nixpkgs-26b89bcd160762633732251061ac29723da9b2b5.zip | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Diffstat (limited to 'pkgs/applications/terminal-emulators/roxterm/default.nix')
| -rw-r--r-- | pkgs/applications/terminal-emulators/roxterm/default.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index c33e3fee704..da9bfac952b 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,4 +1,4 @@ -{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchpatch, fetchFromGitHub +{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 , pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto @@ -6,25 +6,15 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.7.5"; + version = "3.11.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "042hchvgk9jzz035zsgnfhh8105zvspbzz6b78waylsdlgqn0pp1"; + sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx"; }; - patches = [ - # This is the commit directly after v3.7.5. It is needed to get roxterm to - # build correctly. It can be removed when v3.7.6 (or v3.8.0) has been - # released. - (fetchpatch { - url = "https://github.com/realh/roxterm/commit/f7c38fd48bd1810e16d82794bdfb61a9760a2fe1.patch"; - sha256 = "1v77b7ilgf8zy1npxxcyc06mq6lck6bi6lw4aksnq3mi61n5znmx"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; buildInputs = |