Skip to content

Commit d6751d1

Browse files
committed
xfce.xfce4-terminal: 1.1.4 -> 1.1.5
https://gitlab.xfce.org/apps/xfce4-terminal/-/compare/xfce4-terminal-1.1.4...xfce4-terminal-1.1.5 Meson is now the preferred build system.
1 parent f202458 commit d6751d1

File tree

1 file changed

+41
-16
lines changed
  • pkgs/desktops/xfce/applications/xfce4-terminal

1 file changed

+41
-16
lines changed
Lines changed: 41 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,75 @@
11
{
2+
stdenv,
23
lib,
3-
mkXfceDerivation,
4+
fetchFromGitLab,
5+
docbook_xml_dtd_45,
6+
docbook_xsl,
47
glib,
8+
libxslt, # xsltproc
9+
meson,
10+
ninja,
11+
pkg-config,
12+
wrapGAppsHook3,
513
gtk3,
614
gtk-layer-shell,
15+
libutempter,
716
libX11,
817
libxfce4ui,
18+
pcre2,
919
vte,
1020
xfconf,
11-
pcre2,
12-
libxslt,
13-
docbook_xml_dtd_45,
14-
docbook_xsl,
1521
nixosTests,
22+
gitUpdater,
1623
}:
1724

18-
mkXfceDerivation {
19-
category = "apps";
25+
stdenv.mkDerivation (finalAttrs: {
2026
pname = "xfce4-terminal";
21-
version = "1.1.4";
22-
odd-unstable = false;
27+
version = "1.1.5";
2328

24-
sha256 = "sha256-WrmffY8kC9tBorvtEb8q6DmHKX5d7HnvbxtBbpy4LJs=";
29+
src = fetchFromGitLab {
30+
domain = "gitlab.xfce.org";
31+
owner = "apps";
32+
repo = "xfce4-terminal";
33+
tag = "xfce4-terminal-${finalAttrs.version}";
34+
hash = "sha256-qNXrxUjmuY6+k95/zcOu1/CUfhb1u0Ca91aFD3c4uoc=";
35+
};
36+
37+
strictDeps = true;
2538

2639
nativeBuildInputs = [
27-
libxslt
2840
docbook_xml_dtd_45
2941
docbook_xsl
42+
glib # glib-mkenums
43+
libxslt # xsltproc
44+
meson
45+
ninja
46+
pkg-config
47+
wrapGAppsHook3
3048
];
3149

3250
buildInputs = [
3351
glib
3452
gtk3
3553
gtk-layer-shell
54+
libutempter
3655
libX11
3756
libxfce4ui
57+
pcre2
3858
vte
3959
xfconf
40-
pcre2
4160
];
4261

43-
passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal;
62+
passthru = {
63+
tests.test = nixosTests.terminal-emulators.xfce4-terminal;
64+
updateScript = gitUpdater { rev-prefix = "xfce4-terminal-"; };
65+
};
4466

45-
meta = with lib; {
67+
meta = {
4668
description = "Modern terminal emulator";
47-
maintainers = with maintainers; [ ] ++ teams.xfce.members;
69+
homepage = "https://gitlab.xfce.org/apps/xfce4-terminal";
70+
license = lib.licenses.gpl2Plus;
4871
mainProgram = "xfce4-terminal";
72+
maintainers = lib.teams.xfce.members;
73+
platforms = lib.platforms.linux;
4974
};
50-
}
75+
})

0 commit comments

Comments
 (0)