pantheon.wingpanel-applications-menu: 2.7.1 -> 2.8.2

main
Bobby Rong 3 years ago
parent a1447194fd
commit c752b39bcd
No known key found for this signature in database
GPG Key ID: ED07364437C91161
  1. 14
      pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
  2. 8
      pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, substituteAll
@ -19,7 +18,6 @@
, elementary-dock
, bamf
, switchboard-with-plugs
, libunity
, libsoup
, wingpanel
, zeitgeist
@ -29,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
version = "2.7.1";
version = "2.8.2";
repoName = "applications-menu";
@ -37,7 +35,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "sha256-NeazBzkbdQTC6OzPxxyED4OstMkNkUGtCIaZD67fTnM=";
sha256 = "1pm3dnq35vbvyxqapmfy4frfwhc1l2zh634annlmbjiyfp5mzk0q";
};
passthru = {
@ -59,14 +57,12 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
elementary-dock
gnome-menus
granite
gtk3
json-glib
libgee
libhandy
libsoup
libunity
switchboard-with-plugs
wingpanel
zeitgeist
@ -83,12 +79,6 @@ stdenv.mkDerivation rec {
];
patches = [
# Port to Libhandy-1
(fetchpatch {
url = "https://github.com/elementary/applications-menu/commit/8eb2430e8513e9d37f875c5c9b8b15a968c27127.patch";
sha256 = "8Uw9mUw7U5nrAwUDGVpAwoRqb9ah503wQCr9kPbBJIo=";
})
(substituteAll {
src = ./fix-paths.patch;
bc = "${bc}/bin/bc";

@ -1,8 +1,8 @@
diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala
index 18ca3af..f5d1076 100644
index 886a44cd..a4601da6 100644
--- a/src/synapse-plugins/calculator-plugin.vala
+++ b/src/synapse-plugins/calculator-plugin.vala
@@ -44,9 +44,7 @@ namespace Synapse {
@@ -50,9 +50,7 @@ namespace Synapse {
_("Calculator"),
_("Calculate basic expressions."),
"accessories-calculator",
@ -13,10 +13,10 @@ index 18ca3af..f5d1076 100644
);
}
@@ -87,7 +85,7 @@ namespace Synapse {
if (matched) {
@@ -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;

Loading…
Cancel
Save