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:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,70 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, meson
, ninja
, pkg-config
, python3
, vala
, granite
, gtk3
, libgee
, wingpanel
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-a11y";
version = "1.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1adx1sx9qh02hjgv5h0gwyn116shjl3paxmyaiv4cgh6vq3ndp3c";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-a11y/pull/48
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-a11y/commit/fb8412d56bc1c42b70e8ee41b837e8024e1297f7.patch";
sha256 = "0619npdw9wvaz1zk2lzikczyjdqba8v8c9ry9zizvvl4j1i1ad7k";
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
];
buildInputs = [
granite
gtk3
libgee
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 = "Universal Access Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-a11y";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,96 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, substituteAll
, meson
, ninja
, python3
, pkg-config
, vala
, granite
, libgee
, gettext
, gtk3
, gnome-menus
, json-glib
, elementary-dock
, bamf
, switchboard-with-plugs
, libsoup
, wingpanel
, zeitgeist
, bc
, libhandy
}:
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.10.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "applications-menu";
rev = version;
sha256 = "sha256-xBuMJzIFOueSvNwvXc85AI9NHuMW3bOblNsyuDkIzyk=";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
bc = "${bc}/bin/bc";
})
];
nativeBuildInputs = [
gettext
meson
ninja
pkg-config
python3
vala
];
buildInputs = [
bamf
elementary-dock
granite
gtk3
json-glib
libgee
libhandy
libsoup
switchboard-with-plugs
wingpanel
zeitgeist
] ++
# applications-menu has a plugin to search switchboard plugins
# see https://github.com/NixOS/nixpkgs/issues/100209
# wingpanel's wrapper will need to pick up the fact that
# applications-menu needs a version of switchboard with all
# its plugins for search.
switchboard-with-plugs.buildInputs;
mesonFlags = [
"--sysconfdir=${placeholder "out"}/etc"
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Lightweight and stylish app launcher for Pantheon";
homepage = "https://github.com/elementary/applications-menu";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,24 @@
diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala
index 886a44cd..a4601da6 100644
--- a/src/synapse-plugins/calculator-plugin.vala
+++ b/src/synapse-plugins/calculator-plugin.vala
@@ -50,9 +50,7 @@ namespace Synapse {
_("Calculator"),
_("Calculate basic expressions."),
"accessories-calculator",
- register_plugin,
- Environment.find_program_in_path ("bc") != null,
- _("bc is not installed")
+ register_plugin
);
}
@@ -94,7 +92,7 @@ namespace Synapse {
Pid pid;
int read_fd, write_fd;
/* Must include math library to get non-integer results and to access standard math functions */
- string[] argv = {"bc", "-l"};
+ string[] argv = {"@bc@", "-l"};
string? solution = null;
try {

View file

@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pkg-config
, meson
, python3
, ninja
, vala
, gtk3
, glib
, granite
, libnotify
, wingpanel
, libgee
, libxml2
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
version = "2.1.8";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "12rasf8wy3cqnfjlm9s2qnx4drzx0w0yviagkng3kspdzm3vzsqy";
};
nativeBuildInputs = [
glib # for glib-compile-schemas
libxml2
meson
ninja
pkg-config
python3
vala
];
buildInputs = [
glib
granite
gtk3
libgee
libnotify
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 = "Bluetooth Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

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

View file

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

View file

@ -0,0 +1,75 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
, ninja
, substituteAll
, vala
, gtk3
, granite
, libxml2
, wingpanel
, libgee
, xorg
, libgnomekbd
, ibus
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard";
version = "2.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "10zzsil5l6snz47nx887r22sl2n0j6bg4dhxmgk3j3xp3jhgmrgl";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display";
})
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-keyboard/pull/110
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch";
sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0";
})
];
nativeBuildInputs = [
meson
ninja
libxml2
pkg-config
vala
];
buildInputs = [
granite
gtk3
ibus
libgee
wingpanel
xorg.xkeyboardconfig
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Keyboard Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-keyboard";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,13 @@
diff --git a/src/Indicator.vala b/src/Indicator.vala
index cd7ca49..7813789 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -94,7 +94,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator {
private void show_keyboard_map () {
close ();
- string command = "gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\"";
+ string command = "@gkbd_keyboard_display@ \"--layout=" + layouts.get_current_with_variant () + "\"";
try {
AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null);

View file

@ -0,0 +1,58 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, substituteAll
, pkg-config
, meson
, ninja
, vala
, gtk3
, granite
, networkmanager
, libnma
, wingpanel
, libgee
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-network";
version = "2.3.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-4Fg8/Gm9mUqaL3wEc8h+/pMvOfD75ILjo7LhLz6LQmo=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
];
buildInputs = [
granite
gtk3
libgee
networkmanager
libnma
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Network Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-network";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,65 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
, ninja
, vala
, gtk3
, granite
, wingpanel
, libgee
, libxml2
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-nightlight";
version = "2.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1zxjw68byg4sjn8lzsidzmy4ipwxgnv8rm529a7wzlpgj2xq3x4j";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-nightlight/pull/91
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-nightlight/commit/4e15f71ed958df3569b2f1e224b9fb18613281f1.patch";
sha256 = "07awmswyy0988pm6ggyz22mllja675cbdzrjdqc1xd4knwcgy77v";
})
];
nativeBuildInputs = [
libxml2
meson
ninja
pkg-config
vala
];
buildInputs = [
granite
gtk3
libgee
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Night Light Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-nightlight";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pkg-config
, meson
, ninja
, vala
, gtk3
, granite
, wingpanel
, libgee
, libhandy
, elementary-notifications
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
version = "6.0.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-tIpR/WIhE0Mmt2EploNNDVlAX4OUNI3VnEflTLVkfSo=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
vala
];
buildInputs = [
elementary-notifications
granite
gtk3
libgee
libhandy
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Notifications Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-notifications";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,77 @@
{ lib
, stdenv
, fetchFromGitHub
, substituteAll
, nix-update-script
, gnome-power-manager
, pkg-config
, meson
, python3
, ninja
, vala
, gtk3
, granite
, bamf
, libgtop
, libnotify
, udev
, wingpanel
, libgee
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-power";
version = "6.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "1zlpnl7983jkpy2nik08ih8lwrqvm456h993ixa6armzlazdvnjk";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
gnome_power_manager = gnome-power-manager;
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
python3
vala
];
buildInputs = [
bamf
granite
gtk3
libgee
libgtop
libnotify
udev
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 = "Power Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-power";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,13 @@
diff --git a/src/Widgets/DeviceList.vala b/src/Widgets/DeviceList.vala
index 0c56f46..33d97b3 100644
--- a/src/Widgets/DeviceList.vala
+++ b/src/Widgets/DeviceList.vala
@@ -39,7 +39,7 @@ public class Power.Widgets.DeviceList : Gtk.ListBox {
string device_path = path_entries.@get (value);
try {
AppInfo statistics_app = AppInfo.create_from_commandline (
- "gnome-power-statistics --device " + device_path,
+ "@gnome_power_manager@/bin/gnome-power-statistics --device " + device_path,
"",
AppInfoCreateFlags.NONE
);

View file

@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, fetchpatch
, pkg-config
, meson
, ninja
, vala
, gtk3
, granite
, wingpanel
, accountsservice
, libgee
, libhandy
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-session";
version = "2.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0hww856qjl4kjmmksd5gp8bc5vj4fhs2s9fmbnpbf88lg5ds0wv0";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-session/pull/162
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-session/commit/e85032da8e923df4589dc75ccded10026b6c1cd7.patch";
sha256 = "139b2zbc6qjaw41nwfjkqv4npahkzryv4p5m6v10273clv6l72ng";
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
vala
];
buildInputs = [
accountsservice
granite
gtk3
libgee
libhandy
wingpanel
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Session Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-session";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,68 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, pkg-config
, meson
, python3
, ninja
, vala
, gtk3
, granite
, wingpanel
, libnotify
, pulseaudio
, libcanberra-gtk3
, libgee
, libxml2
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
version = "6.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-FHZ4YhGLqGTz5Po2XFJvnWuAi1eHKcT9zzgJFHic02E=";
};
nativeBuildInputs = [
libxml2
meson
ninja
pkg-config
python3
vala
];
buildInputs = [
granite
gtk3
libcanberra-gtk3
libgee
libnotify
pulseaudio
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 = "Sound Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-sound";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}