From 63923e68c773081c61071dc3e146402111ae848f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 16 May 2024 22:42:28 +0800 Subject: [PATCH] pantheon.switchboard-plug-datetime: 2.2.0 -> 8.0.0 https://github.com/elementary/switchboard-plug-datetime/compare/2.2.0...8.0.0 --- .../switchboard-plugs/datetime/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index abb6cfdfe62e..5b874aca3d86 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,16 +1,16 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja , substituteAll , pkg-config , vala +, libadwaita , libgee -, granite -, gtk3 +, granite7 +, gtk4 , libxml2 , switchboard , tzdata @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-datetime"; - version = "2.2.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "10rqhxsqbl1xnz5n84d7m39c3vb71k153989xvyc55djia1wjx96"; + sha256 = "sha256-PE1ig8p9H4MfipIpN3ubXAJNzLwGVW89adn+SF3rEuQ="; }; patches = [ @@ -32,12 +32,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; tzdata = tzdata; }) - # Upstream code not respecting our localedir - # https://github.com/elementary/switchboard-plug-datetime/pull/100 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-datetime/commit/a90639ed4f185f50d4ae448cd9503203dc24b3f4.patch"; - sha256 = "0dz0s02ccnds62dqil44k652pc5icka2rfhcx0a5bj1wi5sifnp7"; - }) ]; nativeBuildInputs = [ @@ -49,8 +43,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - granite - gtk3 + granite7 + gtk4 + libadwaita libgee switchboard ];