Skip to content

Commit 8f3b38d

Browse files
authored
Merge pull request #324495 from JohnRTitor/fix-gnome-clocks
gnome-clocks: add missing gstreamer dependency
2 parents 2675fc3 + 1f9ac8a commit 8f3b38d

File tree

1 file changed

+59
-49
lines changed

1 file changed

+59
-49
lines changed
Lines changed: 59 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
1-
{ stdenv
2-
, lib
3-
, fetchurl
4-
, meson
5-
, ninja
6-
, gettext
7-
, pkg-config
8-
, wrapGAppsHook4
9-
, itstool
10-
, desktop-file-utils
11-
, vala
12-
, libxml2
13-
, gtk4
14-
, glib
15-
, sound-theme-freedesktop
16-
, gsettings-desktop-schemas
17-
, gnome-desktop
18-
, geocode-glib_2
19-
, gnome
20-
, gdk-pixbuf
21-
, geoclue2
22-
, libgweather
23-
, libadwaita
1+
{
2+
stdenv,
3+
lib,
4+
fetchurl,
5+
meson,
6+
ninja,
7+
gettext,
8+
pkg-config,
9+
wrapGAppsHook4,
10+
itstool,
11+
desktop-file-utils,
12+
vala,
13+
libxml2,
14+
gtk4,
15+
glib,
16+
gsettings-desktop-schemas,
17+
gnome-desktop,
18+
geocode-glib_2,
19+
gnome,
20+
gdk-pixbuf,
21+
geoclue2,
22+
gst_all_1,
23+
libgweather,
24+
libadwaita,
2425
}:
2526

26-
stdenv.mkDerivation rec {
27+
stdenv.mkDerivation (finalAttrs: {
2728
pname = "gnome-clocks";
2829
version = "46.0";
2930

3031
src = fetchurl {
31-
url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz";
32+
url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz";
3233
hash = "sha256-6qPFeM3O+XVOZotWJnCbc/NSZxAjX0tyB20v9JpPmcc=";
3334
};
3435

@@ -44,24 +45,24 @@ stdenv.mkDerivation rec {
4445
libxml2
4546
];
4647

47-
buildInputs = [
48-
gtk4
49-
glib
50-
gsettings-desktop-schemas
51-
gdk-pixbuf
52-
gnome-desktop
53-
geocode-glib_2
54-
geoclue2
55-
libgweather
56-
libadwaita
57-
];
58-
59-
preFixup = ''
60-
gappsWrapperArgs+=(
61-
# Fallback sound theme
62-
--prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
63-
)
64-
'';
48+
buildInputs =
49+
[
50+
gtk4
51+
glib
52+
gsettings-desktop-schemas
53+
gdk-pixbuf
54+
gnome-desktop
55+
geocode-glib_2
56+
geoclue2
57+
libgweather
58+
libadwaita
59+
]
60+
++ (with gst_all_1; [
61+
# GStreamer plugins needed for Alarms
62+
gstreamer
63+
gst-plugins-base
64+
gst-plugins-good
65+
]);
6566

6667
doCheck = true;
6768

@@ -72,12 +73,21 @@ stdenv.mkDerivation rec {
7273
};
7374
};
7475

75-
meta = with lib; {
76+
meta = {
7677
homepage = "https://apps.gnome.org/Clocks/";
77-
description = "Clock application designed for GNOME 3";
78+
description = "A simple and elegant clock application for GNOME";
79+
longDescription = ''
80+
A simple and elegant clock application. It includes world clocks, alarms,
81+
a stopwatch, and timers.
82+
83+
- Show the time in different cities around the world
84+
- Set alarms to wake you up
85+
- Measure elapsed time with an accurate stopwatch
86+
- Set timers to properly cook your food
87+
'';
7888
mainProgram = "gnome-clocks";
79-
maintainers = teams.gnome.members;
80-
license = licenses.gpl2Plus;
81-
platforms = platforms.unix;
89+
maintainers = lib.teams.gnome.members;
90+
license = lib.licenses.gpl2Plus;
91+
platforms = lib.platforms.unix;
8292
};
83-
}
93+
})

0 commit comments

Comments
 (0)