mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
Merge pull request #174217 from bobby285271/elementary-mail
pantheon.elementary-mail: 6.4.0 -> 7.0.0
This commit is contained in:
commit
5769c195d4
1 changed files with 4 additions and 16 deletions
|
@ -1,14 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, vala
|
||||
, desktop-file-utils
|
||||
, gtk3
|
||||
, libxml2
|
||||
, libhandy
|
||||
|
@ -16,36 +14,25 @@
|
|||
, folks
|
||||
, libgdata
|
||||
, sqlite
|
||||
, glib-networking
|
||||
, granite
|
||||
, evolution-data-server
|
||||
, appstream
|
||||
, wrapGAppsHook
|
||||
, libgee
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "6.4.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "mail";
|
||||
rev = version;
|
||||
sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc=";
|
||||
sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/elementary/mail/pull/765
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/mail/commit/c3aa61d226f49147d7685cc00013469ff4df369a.patch";
|
||||
sha256 = "sha256-OxNBGIC1hrEaFSufQ59Wb0AMfdzqPt6diL4g3hbL/Ig=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
|
@ -58,6 +45,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
evolution-data-server
|
||||
folks
|
||||
glib-networking
|
||||
granite
|
||||
gtk3
|
||||
libgdata
|
||||
|
|
Loading…
Reference in a new issue