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,38 @@
From eb4a1eae754f222b1be902c2f050704fb0511cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 5 Sep 2020 23:19:23 +0200
Subject: [PATCH] Use dbus_glib instead of elogind
---
cinnamon-session/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
index d8428dc..1f15115 100644
--- a/cinnamon-session/meson.build
+++ b/cinnamon-session/meson.build
@@ -56,6 +56,7 @@ cinnamon_session_sources = [
gdbus_sources,
]
+dbus_glib = dependency('dbus-glib-1')
executable('cinnamon-session',
cinnamon_session_sources,
dependencies: [
@@ -74,7 +75,7 @@ executable('cinnamon-session',
xext,
xrender,
xtest,
- elogind,
+ dbus_glib,
],
link_with: [
libegg,
@@ -98,4 +99,3 @@ foreach unit: units
dependencies: unit[2]
)
endforeach
-
--
2.28.0

View file

@ -0,0 +1,111 @@
{ fetchFromGitHub
, cinnamon-desktop
, cinnamon-settings-daemon
, cinnamon-translations
, dbus-glib
, docbook_xsl
, docbook_xml_dtd_412
, glib
, gsettings-desktop-schemas
, gtk3
, libcanberra
, libxslt
, makeWrapper
, meson
, ninja
, pkg-config
, python3
, lib
, stdenv
, systemd
, wrapGAppsHook
, xapps
, xmlto
, xorg
, libexecinfo
, pango
}:
stdenv.mkDerivation rec {
pname = "cinnamon-session";
version = "5.2.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-E5ascwLnpa5NSBAPo9dXRhoraUntzDPHVV32uDU4U8k=";
};
patches = [
./0001-Use-dbus_glib-instead-of-elogind.patch
];
buildInputs = [
# meson.build
gtk3
glib
libcanberra
pango
xorg.libX11
xorg.libXext
xapps
xorg.libXau
xorg.libXcomposite
systemd
xorg.libXtst
xorg.libXrender
xorg.xtrans
# other (not meson.build)
cinnamon-desktop
cinnamon-settings-daemon
dbus-glib
glib
gsettings-desktop-schemas
];
nativeBuildInputs = [
meson
ninja
wrapGAppsHook
libexecinfo
docbook_xsl
docbook_xml_dtd_412
python3
pkg-config
libxslt
xmlto
];
mesonFlags = [
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
"-Dgconf=false"
# use locales from cinnamon-translations
"--localedir=${cinnamon-translations}/share/locale"
];
postPatch = ''
chmod +x data/meson_install_schemas.py # patchShebangs requires executable file
patchShebangs data/meson_install_schemas.py
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${cinnamon-desktop}/share"
--prefix XDG_CONFIG_DIRS : "${cinnamon-settings-daemon}/etc/xdg"
)
'';
meta = with lib; {
homepage = "https://github.com/linuxmint/cinnamon-session";
description = "The Cinnamon session manager";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = teams.cinnamon.members;
};
}