cinnamon.cinnamon-common: 4.6.1 -> 4.8.6
This commit is contained in:
parent
1795c727ec
commit
048ccae8c5
|
@ -1,5 +1,4 @@
|
||||||
{ atk
|
{ atk
|
||||||
, autoreconfHook
|
|
||||||
, cacert
|
, cacert
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, dbus
|
, dbus
|
||||||
|
@ -42,32 +41,25 @@
|
||||||
, pciutils
|
, pciutils
|
||||||
, timezonemap
|
, timezonemap
|
||||||
, libnma
|
, libnma
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, gst_all_1
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
libcroco = callPackage ./libcroco.nix { };
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cinnamon-common";
|
pname = "cinnamon-common";
|
||||||
version = "4.6.1";
|
version = "4.8.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linuxmint";
|
owner = "linuxmint";
|
||||||
repo = "cinnamon";
|
repo = "cinnamon";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "149lhg953fa0glm250f76z2jzyaabh97jxiqkjnqvsk6bjk1d0bw";
|
hash = "sha256-4DMXQYH1/RjLhgrn55I7Vkk6+gGsR+OVmiwxVHUIyro=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# remove dbus-glib
|
./use-sane-install-dir.patch
|
||||||
(fetchpatch {
|
./libdir.patch
|
||||||
url = "https://github.com/linuxmint/cinnamon/commit/ce99760fa15c3de2e095b9a5372eeaca646fbed1.patch";
|
|
||||||
sha256 = "0p2sbdi5w7sgblqbgisb6f8lcj1syzq5vlk0ilvwaqayxjylg8gz";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://leigh123linux.fedorapeople.org/pub/patches/new_cjs.patch";
|
|
||||||
sha256 = "07biv3vkbn3jzijbdrxcw73p8xz2djbsax014mlkvmryrmys0rg4";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -84,7 +76,6 @@ stdenv.mkDerivation rec {
|
||||||
glib
|
glib
|
||||||
gtk3
|
gtk3
|
||||||
json-glib
|
json-glib
|
||||||
libcroco
|
|
||||||
libsoup
|
libsoup
|
||||||
libstartup_notification
|
libstartup_notification
|
||||||
libXtst
|
libXtst
|
||||||
|
@ -94,6 +85,7 @@ stdenv.mkDerivation rec {
|
||||||
polkit
|
polkit
|
||||||
libxml2
|
libxml2
|
||||||
libgnomekbd
|
libgnomekbd
|
||||||
|
gst_all_1.gstreamer
|
||||||
|
|
||||||
# bindings
|
# bindings
|
||||||
cairo
|
cairo
|
||||||
|
@ -114,23 +106,16 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gobject-introspection
|
gobject-introspection
|
||||||
autoreconfHook
|
meson
|
||||||
|
ninja
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
intltool
|
intltool
|
||||||
gtk-doc
|
gtk-doc
|
||||||
];
|
];
|
||||||
|
|
||||||
autoreconfPhase = ''
|
|
||||||
GTK_DOC_CHECK=false NOCONFIGURE=1 bash ./autogen.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ];
|
configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/Makefile.am \
|
|
||||||
--replace "\$(libdir)/muffin" "${muffin}/lib/muffin"
|
|
||||||
patchShebangs autogen.sh
|
|
||||||
|
|
||||||
find . -type f -exec sed -i \
|
find . -type f -exec sed -i \
|
||||||
-e s,/usr/share/cinnamon,$out/share/cinnamon,g \
|
-e s,/usr/share/cinnamon,$out/share/cinnamon,g \
|
||||||
-e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
|
-e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
|
||||||
|
|
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…
Reference in a new issue