swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-23 13:45:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

pantheon.wingpanel-applications-menu: 2.10.2 -> 2.11.0

Browse source
This commit is contained in:
Bobby Rong 2022-11-16 09:15:33 +08:00
parent b18da0dfe8
commit 51244a007b
No known key found for this signature in database
2 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.10.2";
version = "2.11.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "applications-menu";
rev = version;
sha256 = "sha256-xBuMJzIFOueSvNwvXc85AI9NHuMW3bOblNsyuDkIzyk=";
sha256 = "sha256-pEBvFN+zYsF8CbB29rTNclwAYhw/Hb0HhLzXtijfI4M=";
};
patches = [
@ -80,6 +80,8 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
doCheck = true;
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";

46
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
View file

@ -1,8 +1,21 @@
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 {
diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
index 542e7aa..228c6d7 100644
--- a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
+++ b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
@@ -83,7 +83,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"};
Process.spawn_async_with_pipes (
null, argv, null,
diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
index d14f1de..35c8621 100644
--- a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
+++ b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
@@ -49,9 +49,7 @@ namespace Synapse {
_("Calculator"),
_("Calculate basic expressions."),
"accessories-calculator",
@ -13,12 +26,17 @@ index 886a44cd..a4601da6 100644
);
}
@@ -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 {
diff --git a/src/synapse-plugins/converter-plugin/converter-plugin.vala b/src/synapse-plugins/converter-plugin/converter-plugin.vala
index 8d230cc..ed31927 100644
--- a/src/synapse-plugins/converter-plugin/converter-plugin.vala
+++ b/src/synapse-plugins/converter-plugin/converter-plugin.vala
@@ -46,9 +46,7 @@ namespace Synapse {
_("Converter"),
_("Convert between units."),
"accessories-converter",
- register_plugin,
- Environment.find_program_in_path ("bc") != null,
- _("bc is not installed")
+ register_plugin
);
}