about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-04-03 17:11:04 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2020-04-05 20:39:10 -0400
commitfac751f8159d8e4714303a99e257e2d5f6497ebb (patch)
tree725e0133dec082c31ef5969b6735da1ee4061667
parent5093dcea7b87b331fdac34f7a6ebd3ecc55c7338 (diff)
downloadnixlib-fac751f8159d8e4714303a99e257e2d5f6497ebb.tar
nixlib-fac751f8159d8e4714303a99e257e2d5f6497ebb.tar.gz
nixlib-fac751f8159d8e4714303a99e257e2d5f6497ebb.tar.bz2
nixlib-fac751f8159d8e4714303a99e257e2d5f6497ebb.tar.lz
nixlib-fac751f8159d8e4714303a99e257e2d5f6497ebb.tar.xz
nixlib-fac751f8159d8e4714303a99e257e2d5f6497ebb.tar.zst
nixlib-fac751f8159d8e4714303a99e257e2d5f6497ebb.zip
pantheon.switchboard-plug-datetime: 2.1.6 -> 2.1.7
-rw-r--r--pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix13
-rw-r--r--pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch13
2 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index 501059896f24..271c2e156140 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-datetime";
-  version = "2.1.6";
+  version = "2.1.7";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "09734c3qc0296zf14rdhl4p6ppga015rz9hhsvlcc3nvyw7kdqkc";
+    sha256 = "0lpmxl42r5vn6mddwppn6zwmai0yabs3n467w027vkzw4axdi6bf";
   };
 
   passthru = {
@@ -46,15 +46,6 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
-  patches = [
-    (substituteAll {
-      src = ./timezone.patch;
-      tzdata = "${tzdata}/share/zoneinfo/zone.tab";
-    })
-  ];
-
-  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
   meta = with stdenv.lib; {
     description = "Switchboard Date & Time Plug";
     homepage = https://github.com/elementary/switchboard-plug-datetime;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
deleted file mode 100644
index 35f73d365990..000000000000
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Parser.vala b/src/Parser.vala
-index faccb64..432a362 100644
---- a/src/Parser.vala
-+++ b/src/Parser.vala
-@@ -28,7 +28,7 @@ public class DateTime.Parser : GLib.Object {
-         return parser;
-     }
-     private Parser () {
--        var file = File.new_for_path ("/usr/share/zoneinfo/zone.tab");
-+        var file = File.new_for_path ("@tzdata@");
-         if (!file.query_exists ()) {
-             critical ("/usr/share/zoneinfo/zone.tab doesn't exist !");
-             return;