Merge pull request #221659 from bobby285271/fix/pantheon-bpo (29b574db) · Commits · nix / nixpkgs

pkgs/desktops/pantheon/apps/elementary-mail/default.nix

+10 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, fetchpatch
		, nix-update-script
		, pkg-config
		, meson
		@@ -30,6 +31,15 @@ stdenv.mkDerivation rec {
		sha256 = "sha256-IY+ml/ftLSk0A3Emi0ZL2wxIDIngNU6QKbHErRAaaMA=";
		};

		patches = [
		# MessageListItem: avoid crashing on empty Mime
		# https://github.com/elementary/mail/pull/828
		(fetchpatch {
		url = "https://github.com/elementary/mail/commit/7cb412dee4cc8c0bfab55057c47d5ecce6918788.patch";
		sha256 = "sha256-7rYvgFeVmV/rVYzC/xt/lioRlveM0d8ORqZdMYkm/d4=";
		})
		];

		nativeBuildInputs = [
		libxml2
		meson

+22 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenvNoCC
		, fetchFromGitHub
		, fetchpatch
		, nix-update-script
		, gettext
		, meson
		@@ -20,6 +21,27 @@ stdenvNoCC.mkDerivation rec {
		sha256 = "sha256-KUo9IbB10JRgFrn6I5y4+34PEihuwp78b+YsX2Wqip8=";
		};

		patches = [
		# All patches listed below are fixes for Epiphany 44.
		# https://github.com/elementary/browser/discussions/82
		(fetchpatch {
		url = "https://github.com/elementary/stylesheet/commit/c0028159dd5a7767ead9a12e9a4cfb693159c823.patch";
		sha256 = "sha256-JgJ6FoE2aSTmjJ7klAoYXITbxJwy1HFGvr6F6lVQysY=";
		})
		(fetchpatch {
		url = "https://github.com/elementary/stylesheet/commit/2b9aa7aabce8ab2656340de41f7d5194ddd62078.patch";
		sha256 = "sha256-84sCbVw3JChw25FIKG4eFbj3EkDioefJp5Q938TwXPc=";
		})
		(fetchpatch {
		url = "https://github.com/elementary/stylesheet/commit/88682d3e931fdd46682d3ac8f1f1e700e2514c56.patch";
		sha256 = "sha256-2/yYO9Upt33bZembRRuvcfwpQunD1hhJ/BC2DZSuWPk=";
		})
		(fetchpatch {
		url = "https://github.com/elementary/stylesheet/commit/bb15232abc6167a305b4404467498d11901aea69.patch";
		sha256 = "sha256-L6y61CVRTakSHDvFanhbpsSzLkiSp5Dsm0Fg3RKccQk=";
		})
		];

		nativeBuildInputs = [
		gettext
		meson