push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,83 @@
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
replaceVars,
meson,
ninja,
pkg-config,
vala,
granite,
libgee,
gettext,
gtk3,
json-glib,
switchboard-with-plugs,
wingpanel,
zeitgeist,
bc,
libhandy,
}:
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "8.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "applications-menu";
rev = version;
sha256 = "sha256-bwQI41Znm75GFoXxSbWkY9daAJTMvUo+UHyyPmvzOUA=";
};
patches = [
(replaceVars ./fix-paths.patch {
bc = "${bc}/bin/bc";
})
];
nativeBuildInputs = [
gettext
meson
ninja
pkg-config
vala
];
buildInputs = [
granite
gtk3
json-glib
libgee
libhandy
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"
];
doCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = with lib; {
description = "Lightweight and stylish app launcher for Pantheon";
homepage = "https://github.com/elementary/applications-menu";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
};
}

View File

@@ -0,0 +1,40 @@
diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
index 84454146..fb082fe4 100644
--- a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
+++ b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
@@ -73,7 +73,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 089b8278..0e532bfc 100644
--- a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
+++ b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
@@ -47,8 +47,7 @@ namespace Synapse {
DataSink.PluginRegistry.get_default ().register_plugin (
typeof (CalculatorPlugin),
"accessories-calculator",
- register_plugin,
- Environment.find_program_in_path ("bc") != null
+ register_plugin
);
}
diff --git a/src/synapse-plugins/converter-plugin/converter-plugin.vala b/src/synapse-plugins/converter-plugin/converter-plugin.vala
index 34391e6a..a5bfc71e 100644
--- a/src/synapse-plugins/converter-plugin/converter-plugin.vala
+++ b/src/synapse-plugins/converter-plugin/converter-plugin.vala
@@ -44,8 +44,7 @@ namespace Synapse {
DataSink.PluginRegistry.get_default ().register_plugin (
typeof (ConverterPlugin),
"accessories-converter",
- register_plugin,
- Environment.find_program_in_path ("bc") != null
+ register_plugin
);
}