diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 8f2ec6f85dd4..e15125a00bf2 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , libdazzle , libgweather @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0="; }; @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch"; sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE="; }) + + # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84.patch"; + sha256 = "czG3uIHl3tBnjDUvCOPm8IRp2o7yZYCb0/jWtv3uzIY="; + }) ]; passthru = { @@ -50,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext libxml2 wrapGAppsHook @@ -77,7 +83,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/meson_post_install.py ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; maintainers = teams.gnome.members; |