diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 03954fac6448..ad030277463c 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,8 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script +, substituteAll , pantheon , pkg-config , meson @@ -13,6 +15,7 @@ , evolution-data-server , libical , libgee +, libhandy , libxml2 , libsoup , libgdata @@ -21,13 +24,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; - version = "2.2.5"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-rZzZIh4bwZfwQFDbfPDKQtfLMJQ2IdykH1yiV6ckqnw="; + sha256 = "1mdm0fsnmmyw8c0ik2jmfri3kas9zkz1hskzf8wvbd51vnazfpgw"; }; passthru = { @@ -50,12 +53,26 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy libical libsoup wingpanel libgdata # required by some dependency transitively ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + elementary_calendar = elementary-calendar; + }) + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-datetime/pull/269 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/f7befa68a9fd6215297c334a366919d3431cae65.patch"; + sha256 = "0l997b1pnpjscs886xy28as5yykxamxacvxdv8466zin7zynarfs"; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -64,8 +81,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Date & Time Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-datetime"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } |