Skip to content

Commit

Permalink
Merge pull request #324495 from JohnRTitor/fix-gnome-clocks
Browse files Browse the repository at this point in the history
gnome-clocks: add missing gstreamer dependency
  • Loading branch information
JohnRTitor authored Jul 6, 2024
2 parents 2675fc3 + 1f9ac8a commit 8f3b38d
Showing 1 changed file with 59 additions and 49 deletions.
108 changes: 59 additions & 49 deletions pkgs/desktops/gnome/apps/gnome-clocks/default.nix
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, gettext
, pkg-config
, wrapGAppsHook4
, itstool
, desktop-file-utils
, vala
, libxml2
, gtk4
, glib
, sound-theme-freedesktop
, gsettings-desktop-schemas
, gnome-desktop
, geocode-glib_2
, gnome
, gdk-pixbuf
, geoclue2
, libgweather
, libadwaita
{
stdenv,
lib,
fetchurl,
meson,
ninja,
gettext,
pkg-config,
wrapGAppsHook4,
itstool,
desktop-file-utils,
vala,
libxml2,
gtk4,
glib,
gsettings-desktop-schemas,
gnome-desktop,
geocode-glib_2,
gnome,
gdk-pixbuf,
geoclue2,
gst_all_1,
libgweather,
libadwaita,
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-clocks";
version = "46.0";

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

Expand All @@ -44,24 +45,24 @@ stdenv.mkDerivation rec {
libxml2
];

buildInputs = [
gtk4
glib
gsettings-desktop-schemas
gdk-pixbuf
gnome-desktop
geocode-glib_2
geoclue2
libgweather
libadwaita
];

preFixup = ''
gappsWrapperArgs+=(
# Fallback sound theme
--prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
)
'';
buildInputs =
[
gtk4
glib
gsettings-desktop-schemas
gdk-pixbuf
gnome-desktop
geocode-glib_2
geoclue2
libgweather
libadwaita
]
++ (with gst_all_1; [
# GStreamer plugins needed for Alarms
gstreamer
gst-plugins-base
gst-plugins-good
]);

doCheck = true;

Expand All @@ -72,12 +73,21 @@ stdenv.mkDerivation rec {
};
};

meta = with lib; {
meta = {
homepage = "https://apps.gnome.org/Clocks/";
description = "Clock application designed for GNOME 3";
description = "A simple and elegant clock application for GNOME";
longDescription = ''
A simple and elegant clock application. It includes world clocks, alarms,
a stopwatch, and timers.
- Show the time in different cities around the world
- Set alarms to wake you up
- Measure elapsed time with an accurate stopwatch
- Set timers to properly cook your food
'';
mainProgram = "gnome-clocks";
maintainers = teams.gnome.members;
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = lib.teams.gnome.members;
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
};
}
})

0 comments on commit 8f3b38d

Please sign in to comment.