pantheon.granite: 5.2.3 -> 5.2.5

Drop patch for ️ gsettings dep.
This commit is contained in:
worldofpeace 2019-09-18 17:15:19 -04:00
parent 96f72ebe93
commit 451c9d835f
1 changed files with 2 additions and 18 deletions

View File

@ -1,6 +1,5 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, python3 , python3
, meson , meson
, ninja , ninja
@ -17,30 +16,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "granite"; pname = "granite";
version = "5.2.3"; version = "5.2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "10ddq1s2w4jvpzq813cylmqhh8pggzaz890fy3kzg07275i98gah"; sha256 = "0z40vhcp2w8s8rnc56pzvjc4s77bln8k84rwwypivjmk3lhpw1vi";
}; };
patches = [
# Resolve the circular dependency between granite and the datetime wingpanel indicator
# See: https://github.com/elementary/granite/pull/242
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/granite/raw/0550b44ed6400c9b1ff7e70871913747df2ff323/f/00-datetime-clock-format-gsettings.patch";
sha256 = "0i9yvdmn77x5fjdwd1raw6ym8js8yxa7w6ydc7syx7hcyls00dmq";
})
# Fix build latest vala.
(fetchpatch {
url = "https://github.com/elementary/granite/commit/fd26013c84afdeb6300ae2f4a574856753fc2b58.patch";
sha256 = "01nxqhj8gr61n6wx6ccrqdn25nmbrhhk437k21g4mxqx0gnih265";
})
];
passthru = { passthru = {
updateScript = pantheon.updateScript { updateScript = pantheon.updateScript {
repoName = pname; repoName = pname;