dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #151493 from bobby285271/ayatana

Browse Source 
wingpanel-indicator-ayatana: unstable-2021-12-01 -> unstable-2021-12-18
This commit is contained in:
Bobby Rong 2021-12-21 10:15:47 +08:00 committed by GitHub
commit a0e2981691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix vendored
View File

@ -14,19 +14,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wingpanel-indicator-ayatana"; pname = "wingpanel-indicator-ayatana";
version = "unstable-2021-12-01"; version = "unstable-2021-12-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Lafydev"; owner = "Lafydev";
repo = pname; repo = pname;
rev = "53dc05919cdba772c787620a4bee5821e38c53cd"; rev = "5749f753ca64ce58232a46b9045949b3f8219827";
sha256 = "sha256-T0OHzqENyeAr0pvXUaRMwF1RpwKVyDAF5P5G9S28COU="; sha256 = "sha256-kuEVw62IDTyC3hRRcWv2RihPOohGqEt8YLr44SurwPM=";
}; };
patches = [ 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 # Tells the indicator the path for libapplication.so
(substituteAll { (substituteAll {
src = ./fix-libapplication-dir.patch; src = ./fix-libapplication-dir.patch;

16
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch vendored
View File

@ -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: