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:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
92
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
Normal file
92
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, wrapGAppsHook
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
, gala
|
||||
, gtk3
|
||||
, libgee
|
||||
, granite
|
||||
, gettext
|
||||
, mutter
|
||||
, mesa
|
||||
, json-glib
|
||||
, python3
|
||||
, elementary-gtk-theme
|
||||
, elementary-icon-theme
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WvkQx+9YjKCINpyVg8KjCV0GAb0rJfblSFaO14/4oas=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./indicators.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
elementary-icon-theme
|
||||
gala
|
||||
granite
|
||||
gtk3
|
||||
json-glib
|
||||
libgee
|
||||
mutter
|
||||
mesa # for libEGL
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# this GTK theme is required
|
||||
--prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share"
|
||||
|
||||
# the icon theme is required
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The extensible top panel for Pantheon";
|
||||
longDescription = ''
|
||||
Wingpanel is an empty container that accepts indicators as extensions,
|
||||
including the applications menu.
|
||||
'';
|
||||
homepage = "https://github.com/elementary/wingpanel";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
mainProgram = "io.elementary.wingpanel";
|
||||
};
|
||||
}
|
||||
21
pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch
Normal file
21
pkgs/desktops/pantheon/desktop/wingpanel/indicators.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/lib/IndicatorManager.vala b/lib/IndicatorManager.vala
|
||||
index a99a1ec..0ae7799 100644
|
||||
--- a/lib/IndicatorManager.vala
|
||||
+++ b/lib/IndicatorManager.vala
|
||||
@@ -115,7 +115,15 @@ public class Wingpanel.IndicatorManager : GLib.Object {
|
||||
}
|
||||
|
||||
/* load indicators */
|
||||
- var base_folder = File.new_for_path (Build.INDICATORS_DIR);
|
||||
+
|
||||
+ var indicators_path = Environment.get_variable("WINGPANEL_INDICATORS_PATH");
|
||||
+ if (indicators_path != null) {
|
||||
+ debug ("WINGPANEL_INDICATORS_PATH set to %s", indicators_path);
|
||||
+ } else {
|
||||
+ critical ("WINGPANEL_INDICATORS_PATH not set");
|
||||
+ }
|
||||
+
|
||||
+ var base_folder = File.new_for_path (indicators_path);
|
||||
|
||||
try {
|
||||
monitor = base_folder.monitor_directory (FileMonitorFlags.NONE, null);
|
||||
61
pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
Normal file
61
pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, stdenv
|
||||
, xorg
|
||||
, wingpanel
|
||||
, wingpanelIndicators
|
||||
, switchboard-with-plugs
|
||||
, indicators ? null
|
||||
# Only useful to disable for development testing.
|
||||
, useDefaultIndicators ? true
|
||||
}:
|
||||
|
||||
let
|
||||
selectedIndicators =
|
||||
if indicators == null then wingpanelIndicators
|
||||
else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${wingpanel.pname}-with-indicators";
|
||||
inherit (wingpanel) version;
|
||||
|
||||
src = null;
|
||||
|
||||
paths = [
|
||||
wingpanel
|
||||
] ++ selectedIndicators;
|
||||
|
||||
passAsFile = [ "paths" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = lib.forEach selectedIndicators (x: x.buildInputs)
|
||||
++ selectedIndicators;
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
for i in $(cat $pathsPath); do
|
||||
${xorg.lndir}/bin/lndir -silent $i $out
|
||||
done
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
|
||||
--set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard"
|
||||
)
|
||||
'';
|
||||
|
||||
inherit (wingpanel) meta;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue