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
167
pkgs/desktops/cinnamon/cinnamon-common/default.nix
Normal file
167
pkgs/desktops/cinnamon/cinnamon-common/default.nix
Normal file
|
|
@ -0,0 +1,167 @@
|
|||
{ atk
|
||||
, cacert
|
||||
, fetchpatch
|
||||
, dbus
|
||||
, cinnamon-control-center
|
||||
, cinnamon-desktop
|
||||
, cinnamon-menus
|
||||
, cinnamon-session
|
||||
, cinnamon-translations
|
||||
, cjs
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
, libgnomekbd
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, intltool
|
||||
, json-glib
|
||||
, callPackage
|
||||
, libsoup
|
||||
, libstartup_notification
|
||||
, libXtst
|
||||
, libXdamage
|
||||
, muffin
|
||||
, networkmanager
|
||||
, pkg-config
|
||||
, polkit
|
||||
, lib
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
, libxml2
|
||||
, gtk-doc
|
||||
, gnome
|
||||
, python3
|
||||
, keybinder3
|
||||
, cairo
|
||||
, xapps
|
||||
, upower
|
||||
, nemo
|
||||
, libnotify
|
||||
, accountsservice
|
||||
, gnome-online-accounts
|
||||
, glib-networking
|
||||
, pciutils
|
||||
, timezonemap
|
||||
, libnma
|
||||
, meson
|
||||
, ninja
|
||||
, gst_all_1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-common";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon";
|
||||
rev = version;
|
||||
hash = "sha256-B2Du2zis0xWeeyh3kSyz1doWImk9Fuk4qQ8HNZZdqdw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-sane-install-dir.patch
|
||||
./libdir.patch
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/cinnamon/commit/77ed66050f7df889fcb7a10b702c7b8bcdeaa130.patch";
|
||||
sha256 = "sha256-OegLxz6Xr/nxVwVOAd2oOY62ohZ3r6uYn1+YED5EBHQ=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
# TODO: review if we really need this all
|
||||
(python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ]))
|
||||
atk
|
||||
cacert
|
||||
cinnamon-control-center
|
||||
cinnamon-desktop
|
||||
cinnamon-menus
|
||||
cjs
|
||||
dbus
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
json-glib
|
||||
libsoup
|
||||
libstartup_notification
|
||||
libXtst
|
||||
libXdamage
|
||||
muffin
|
||||
networkmanager
|
||||
pkg-config
|
||||
polkit
|
||||
libxml2
|
||||
libgnomekbd
|
||||
gst_all_1.gstreamer
|
||||
|
||||
# bindings
|
||||
cairo
|
||||
gnome.caribou
|
||||
keybinder3
|
||||
upower
|
||||
xapps
|
||||
timezonemap
|
||||
nemo
|
||||
libnotify
|
||||
accountsservice
|
||||
libnma
|
||||
|
||||
# gsi bindings
|
||||
gnome-online-accounts
|
||||
glib-networking # for goa
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
wrapGAppsHook
|
||||
intltool
|
||||
gtk-doc
|
||||
];
|
||||
|
||||
# use locales from cinnamon-translations (not using --localedir because datadir is used)
|
||||
postInstall = ''
|
||||
ln -s ${cinnamon-translations}/share/locale $out/share/locale
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
find . -type f -exec sed -i \
|
||||
-e s,/usr/share/cinnamon,$out/share/cinnamon,g \
|
||||
-e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
|
||||
{} +
|
||||
|
||||
sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
|
||||
|
||||
sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
|
||||
sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
|
||||
|
||||
sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings
|
||||
# this one really IS optional
|
||||
sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings
|
||||
|
||||
sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
|
||||
|
||||
# another bunch of optional stuff
|
||||
sed "s|/usr/bin|/run/current-system/sw/bin|g" -i ./files/usr/bin/cinnamon-launcher
|
||||
|
||||
sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
|
||||
|
||||
sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d
|
||||
sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
providedSessions = [ "cinnamon" "cinnamon2d" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/linuxmint/cinnamon";
|
||||
description = "The Cinnamon desktop environment";
|
||||
license = [ licenses.gpl2 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.cinnamon.members;
|
||||
};
|
||||
}
|
||||
25
pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
Normal file
25
pkgs/desktops/cinnamon/cinnamon-common/libdir.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From 1c99ff9b042d77d97a0841c78fceb7cfbf41aa8b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
|
||||
Date: Sun, 28 Feb 2021 05:58:09 +0100
|
||||
Subject: [PATCH] libdir patch
|
||||
|
||||
---
|
||||
meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 3c1e9a4f..a77d9b3c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -14,7 +14,7 @@ includedir = get_option('includedir')
|
||||
libexecdir = get_option('libexecdir')
|
||||
desktopdir = join_paths(datadir, 'applications')
|
||||
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
|
||||
-pkglibdir = join_paths(libdir, meson.project_name().to_lower())
|
||||
+pkglibdir = libdir
|
||||
servicedir = join_paths(datadir, 'dbus-1', 'services')
|
||||
pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
|
||||
po_dir = join_paths(meson.source_root(), 'po')
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
From f7e802959d7a5c217ed574cab30404fc769f174d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
|
||||
Date: Sat, 6 Feb 2021 14:26:26 +0100
|
||||
Subject: [PATCH] use sane install dir
|
||||
|
||||
---
|
||||
meson.build | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index bd803f20..3c1e9a4f 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -127,8 +127,14 @@ configure_file(
|
||||
)
|
||||
|
||||
install_subdir(
|
||||
- 'files',
|
||||
- install_dir: '/',
|
||||
+ 'files/usr',
|
||||
+ install_dir: get_option('prefix'),
|
||||
+ strip_directory: true,
|
||||
+)
|
||||
+
|
||||
+install_subdir(
|
||||
+ 'files/etc',
|
||||
+ install_dir: join_paths(get_option('prefix'), 'etc'),
|
||||
strip_directory: true,
|
||||
)
|
||||
|
||||
--
|
||||
2.30.0
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue