Skip to content

Commit f202458

Browse files
committed
xfce.ristretto: 0.13.3 -> 0.13.4
https://gitlab.xfce.org/apps/ristretto/-/compare/ristretto-0.13.3...ristretto-0.13.4 Meson is now the preferred build system.
1 parent 9269c51 commit f202458

File tree

1 file changed

+43
-14
lines changed

1 file changed

+43
-14
lines changed

pkgs/desktops/xfce/applications/ristretto/default.nix

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,52 @@
11
{
2+
stdenv,
23
lib,
3-
mkXfceDerivation,
4-
gtk3,
4+
fetchFromGitLab,
55
glib,
6-
gnome,
6+
meson,
7+
ninja,
8+
pkg-config,
9+
wrapGAppsHook3,
10+
cairo,
11+
exo,
12+
gtk3,
713
libexif,
14+
libxfce4ui,
15+
libxfce4util,
16+
xfconf,
17+
gnome,
818
libheif,
919
libjxl,
1020
librsvg,
11-
libxfce4ui,
12-
libxfce4util,
1321
webp-pixbuf-loader,
14-
xfconf,
22+
gitUpdater,
1523
}:
1624

17-
mkXfceDerivation {
18-
category = "apps";
25+
stdenv.mkDerivation (finalAttrs: {
1926
pname = "ristretto";
20-
version = "0.13.3";
21-
odd-unstable = false;
27+
version = "0.13.4";
28+
29+
src = fetchFromGitLab {
30+
domain = "gitlab.xfce.org";
31+
owner = "apps";
32+
repo = "ristretto";
33+
tag = "ristretto-${finalAttrs.version}";
34+
hash = "sha256-X0liZddeEOxlo0tyn3Irvo0+MTnMFuvKY2m4h+/EI2E=";
35+
};
2236

23-
sha256 = "sha256-cJMHRN4Wl6Fm0yoVqe0h30ZUlE1+Hw1uEDBHfHXBbC0=";
37+
strictDeps = true;
38+
39+
nativeBuildInputs = [
40+
glib # glib-compile-schemas
41+
meson
42+
ninja
43+
pkg-config
44+
wrapGAppsHook3
45+
];
2446

2547
buildInputs = [
48+
cairo
49+
exo
2650
glib
2751
gtk3
2852
libexif
@@ -46,9 +70,14 @@ mkXfceDerivation {
4670
}"
4771
'';
4872

49-
meta = with lib; {
73+
passthru.updateScript = gitUpdater { rev-prefix = "ristretto-"; };
74+
75+
meta = {
5076
description = "Fast and lightweight picture-viewer for the Xfce desktop environment";
77+
homepage = "https://gitlab.xfce.org/apps/ristretto";
78+
license = lib.licenses.gpl2Plus;
5179
mainProgram = "ristretto";
52-
maintainers = with maintainers; [ ] ++ teams.xfce.members;
80+
maintainers = lib.teams.xfce.members;
81+
platforms = lib.platforms.linux;
5382
};
54-
}
83+
})

0 commit comments

Comments
 (0)