mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

pantheon.switchboard-plug-datetime: 2.1.6 -> 2.1.7

Browse source
This commit is contained in:
worldofpeace 2020-04-03 17:11:04 -04:00
parent 5093dcea7b
commit fac751f815
2 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
View file

@ -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;

13
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch
View file

@ -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;