diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-12-20 23:02:50 +0800 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-12-21 02:19:46 +0000 |
| commit | f6c0ce5e4ab9d0eb0bf77510c49de7e61de40920 (patch) | |
| tree | 4f5002b34dda6f9fb76d48db15cb0a8dcc3707c0 | |
| parent | Merge pull request #151231 from NixOS/backport-150435-to-release-21.11 (diff) | |
| download | nixpkgs-f6c0ce5e4ab9d0eb0bf77510c49de7e61de40920.tar.gz | |
wingpanel-indicator-ayatana: unstable-2021-12-01 -> unstable-2021-12-18
(cherry picked from commit faa933d4c023055faac40d83dd80ee230eaf678e)
| -rw-r--r-- | pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch | 16 |
2 files changed, 3 insertions, 22 deletions
diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix index 6acb1fe36f44..6e3fbf5777bc 100644 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -14,19 +14,16 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-ayatana"; - version = "unstable-2021-12-01"; + version = "unstable-2021-12-18"; src = fetchFromGitHub { owner = "Lafydev"; repo = pname; - rev = "53dc05919cdba772c787620a4bee5821e38c53cd"; - sha256 = "sha256-T0OHzqENyeAr0pvXUaRMwF1RpwKVyDAF5P5G9S28COU="; + rev = "5749f753ca64ce58232a46b9045949b3f8219827"; + sha256 = "sha256-kuEVw62IDTyC3hRRcWv2RihPOohGqEt8YLr44SurwPM="; }; patches = [ - # Fixes install path for wingpanel indicator - # https://github.com/Lafydev/wingpanel-indicator-ayatana/pull/30 - ./fix-indicator-dir.patch # Tells the indicator the path for libapplication.so (substituteAll { src = ./fix-libapplication-dir.patch; diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch deleted file mode 100644 index e6f71558e3e4..000000000000 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/meson.build b/meson.build -index 4aeab2b..dc44e6c 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,8 +25,10 @@ dependencies = { - 'wingpanel': wingpanel - } - -+libdir = join_paths(get_option('prefix'), get_option('libdir')) -+ - indicator_name = 'ayatana' --indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir') -+indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]) - - # ---------------------------------------------------------------------------------------------------------------------- - # Bindings: |