uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,80 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
, vala
|
||||
, gtk3
|
||||
, granite
|
||||
, wingpanel
|
||||
, evolution-data-server
|
||||
, libical
|
||||
, libgee
|
||||
, libhandy
|
||||
, libxml2
|
||||
, libsoup
|
||||
, libgdata
|
||||
, elementary-calendar
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-datetime";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GxlnzLDrZmDDAGlUMoM4k4SkbCqra3Th6ugRAj3Wse4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
elementary_calendar = elementary-calendar;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server
|
||||
granite
|
||||
gtk3
|
||||
libgee
|
||||
libhandy
|
||||
libical
|
||||
libsoup
|
||||
wingpanel
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Date & Time Indicator for Wingpanel";
|
||||
homepage = "https://github.com/elementary/wingpanel-indicator-datetime";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/src/Indicator.vala b/src/Indicator.vala
|
||||
index 4aba03c..6385bc9 100644
|
||||
--- a/src/Indicator.vala
|
||||
+++ b/src/Indicator.vala
|
||||
@@ -55,7 +55,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {
|
||||
|
||||
panel_label.button_press_event.connect ((e) => {
|
||||
if (e.button == Gdk.BUTTON_MIDDLE) {
|
||||
- var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
|
||||
+ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
|
||||
try {
|
||||
var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);
|
||||
appinfo.launch_uris (null, null);
|
||||
diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
|
||||
index cb54253..7477d1a 100644
|
||||
--- a/src/Widgets/calendar/CalendarView.vala
|
||||
+++ b/src/Widgets/calendar/CalendarView.vala
|
||||
@@ -242,7 +242,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
|
||||
|
||||
// TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app.
|
||||
public void show_date_in_maya (GLib.DateTime date) {
|
||||
- var command = "io.elementary.calendar --show-day %s".printf (date.format ("%F"));
|
||||
+ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (date.format ("%F"));
|
||||
|
||||
try {
|
||||
var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);
|
||||
Loading…
Add table
Add a link
Reference in a new issue