diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime | |
parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime')
-rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix | 15 | ||||
-rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch | 13 |
2 files changed, 3 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 501059896f24..adb6e187915f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/nixpkgs/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,18 +46,9 @@ 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; + homepage = "https://github.com/elementary/switchboard-plug-datetime"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch deleted file mode 100644 index 35f73d365990..000000000000 --- a/nixpkgs/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; |