uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,62 @@
{ lib
, stdenv
, fetchFromGitHub
, unstableGitUpdater
, substituteAll
, meson
, ninja
, pkg-config
, vala
, gtk3
, libindicator-gtk3
, pantheon
, indicator-application-gtk3
}:
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-ayatana";
version = "unstable-2021-12-18";
src = fetchFromGitHub {
owner = "Lafydev";
repo = pname;
rev = "5749f753ca64ce58232a46b9045949b3f8219827";
sha256 = "sha256-kuEVw62IDTyC3hRRcWv2RihPOohGqEt8YLr44SurwPM=";
};
patches = [
# Tells the indicator the path for libapplication.so
(substituteAll {
src = ./fix-libapplication-dir.patch;
indicator_application = indicator-application-gtk3;
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
vala
];
buildInputs = [
gtk3
libindicator-gtk3
pantheon.granite
pantheon.wingpanel
];
passthru = {
updateScript = unstableGitUpdater {
url = "https://github.com/Lafydev/wingpanel-indicator-ayatana.git";
};
};
meta = with lib; {
description = "Ayatana Compatibility Indicator for Wingpanel";
homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
};
}

View file

@ -0,0 +1,13 @@
diff --git a/src/IndicatorFactory.vala b/src/IndicatorFactory.vala
index 9411de0..632d83b 100644
--- a/src/IndicatorFactory.vala
+++ b/src/IndicatorFactory.vala
@@ -24,7 +24,7 @@ public class AyatanaCompatibility.IndicatorFactory : Object, IndicatorLoader {
public Gee.Collection<IndicatorIface> get_indicators () {
if (indicators == null) {
indicators = new Gee.LinkedList<IndicatorIface> ();
- load_indicator (File.new_for_path (Constants.AYATANA_INDICATOR_DIR), "libapplication.so");
+ load_indicator (File.new_for_path ("@indicator_application@/lib/indicators3/7/"), "libapplication.so");
}
return indicators.read_only_view;