JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112147 from mkg20001/cinnamon-upgrade

Browse Source
This commit is contained in:
Maciej Krüger 2021-04-19 14:59:58 +02:00 committed by GitHub
commit 5f8839fd09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 158 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@ -1,5 +1,4 @@
{ atk
, autoreconfHook
, cacert
, fetchpatch
, dbus
@ -42,32 +41,25 @@
, pciutils
, timezonemap
, libnma
, meson
, ninja
, gst_all_1
}:
let
libcroco = callPackage ./libcroco.nix { };
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "4.6.1";
version = "4.8.6";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
sha256 = "149lhg953fa0glm250f76z2jzyaabh97jxiqkjnqvsk6bjk1d0bw";
hash = "sha256-4DMXQYH1/RjLhgrn55I7Vkk6+gGsR+OVmiwxVHUIyro=";
};
patches = [
# remove dbus-glib
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/ce99760fa15c3de2e095b9a5372eeaca646fbed1.patch";
sha256 = "0p2sbdi5w7sgblqbgisb6f8lcj1syzq5vlk0ilvwaqayxjylg8gz";
})
(fetchpatch {
url = "https://leigh123linux.fedorapeople.org/pub/patches/new_cjs.patch";
sha256 = "07biv3vkbn3jzijbdrxcw73p8xz2djbsax014mlkvmryrmys0rg4";
})
./use-sane-install-dir.patch
./libdir.patch
];
buildInputs = [
@ -84,7 +76,6 @@ stdenv.mkDerivation rec {
glib
gtk3
json-glib
libcroco
libsoup
libstartup_notification
libXtst
@ -94,6 +85,7 @@ stdenv.mkDerivation rec {
polkit
libxml2
libgnomekbd
gst_all_1.gstreamer
# bindings
cairo
@ -114,23 +106,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gobject-introspection
autoreconfHook
meson
ninja
wrapGAppsHook
intltool
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" ];
postPatch = ''
substituteInPlace src/Makefile.am \
--replace "\$(libdir)/muffin" "${muffin}/lib/muffin"
patchShebangs autogen.sh
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 \

33
pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix
View File

@ -1,33 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, libxml2, glib, gnome3 }:
stdenv.mkDerivation rec {
pname = "libcroco";
version = "0.6.13";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn";
};
outputs = [ "out" "dev" ];
outputBin = "dev";
configureFlags = lib.optional stdenv.isDarwin "--disable-Bsymbolic";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 glib ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with lib; {
description = "GNOME CSS2 parsing and manipulation toolkit";
homepage = https://gitlab.gnome.org/GNOME/libcroco;
license = licenses.lgpl2;
platforms = platforms.unix;
};
}

25
pkgs/desktops/cinnamon/cinnamon-common/libdir.patch Normal file
View 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

33
pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch Normal file
View File

@ -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

29
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
View File

@ -1,11 +1,9 @@
{ lib, stdenv
, fetchFromGitHub
, pkg-config
, autoreconfHook
, glib
, gettext
, cinnamon-desktop
, intltool
, gtk3
, libnotify
, libxml2
@ -20,7 +18,7 @@
, libxklavier
, networkmanager
, libwacom
, libtool
, gnome3
, wrapGAppsHook
, tzdata
, glibc
@ -28,17 +26,19 @@
, modemmanager
, xorg
, gdk-pixbuf
, meson
, ninja
}:
stdenv.mkDerivation rec {
pname = "cinnamon-control-center";
version = "4.6.2";
version = "4.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "0fbgi2r2xikpa04k431qq9akngi9akyflq1kcks8f095qs5gsana";
hash = "sha256-vALThDY0uN9bV7b1fga3MK7b2/l5uL33+B2x6oSLPRE=";
};
buildInputs = [
@ -70,16 +70,11 @@ stdenv.mkDerivation rec {
./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */
postPatch = ''
patchShebangs ./autogen.sh
sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c
sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h
sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c
'';
autoreconfPhase = ''
NOCONFIGURE=1 bash ./autogen.sh
'';
# it needs to have access to that file, otherwise we can't run tests after build
preBuild = ''
@ -87,19 +82,23 @@ stdenv.mkDerivation rec {
ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/
'';
mesonFlags = [
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
];
preInstall = ''
rm -rfv $out
rm -r $out
'';
doCheck = true;
# the only test is wacom-calibrator and it seems to need an xserver and prob more services aswell
doCheck = false;
nativeBuildInputs = [
pkg-config
autoreconfHook
meson
ninja
wrapGAppsHook
gettext
intltool
libtool
];
meta = with lib; {

4
pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-desktop";
version = "4.6.4";
version = "4.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "08z5hgc6dwdp9fczm75axwh8q9665iz4y2lxp92xp62r3k0v9fvd";
hash = "sha256-FLruY1lxzB3iJ/So3jSjrbv9e8VoN/0+U2YDXju/u3E=";
};
outputs = [ "out" "dev" ];

4
pkgs/desktops/cinnamon/cinnamon-menus/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-menus";
version = "4.6.1";
version = "4.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1qdaql4mknhzvl2qi1pyw4c820lqb7lg07gblh0wzfk4f7h8hddx";
hash = "sha256-9VSrqCjC8U3js1gqjl5QFctWYECATxN+AdfMdHLxYUY=";
};
buildInputs = [

12
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View File

@ -23,27 +23,19 @@
, xapps
, xorg
, iso-flags-png-320x420
, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "cinnamon-screensaver";
version = "4.6.0";
version = "4.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "068lh6wcmznfyvny7hx83q2rf4j96b6mv4a5v79y02k9110m7bsm";
hash = "sha256-gvSGxSYKnRqJhj2unRYRHp6qGw/O9SxKPzhw5xjCSSQ=";
};
patches = [
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon-screensaver/pull/349/commits/4a9e5715f406bf2ca1aacddd5fd8f830102a423c.patch";
sha256 = "0fmkmskry4c88zcw0i8vsmh6q14k3m937hqi77p5xi1p93imr46y";
})
];
nativeBuildInputs = [
pkg-config
wrapGAppsHook

4
pkgs/desktops/cinnamon/cinnamon-session/default.nix
View File

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-session";
version = "4.6.2";
version = "4.8.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "133vpgs0dqr16pvx5wyxhfcargn9wl14z0q99m2pn93hf6zycmsv";
hash = "sha256-lrwR8VSdPzHoc9MeBEQPbVfWNhPZDJ2wYizKSVpobmk=";
};
patches = [

29
pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
View File

@ -1,4 +1,4 @@
From 6d71bf9764fb81d437678a603826167850bbf453 Mon Sep 17 00:00:00 2001
From 7fa408ebd72c9f1ff7ff4e9d7f4a811465a8a41b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 21 Jan 2020 03:19:28 +0100
Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
@ -6,35 +6,35 @@ Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
---
plugins/power/csd-power-manager.c | 4 ++--
.../org.cinnamon.settings-daemon.plugins.power.policy.in.in | 2 +-
.../org.cinnamon.settings-daemon.plugins.power.policy.in | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
index b24c456..212c47e 100755
index 33f4489..84dd98b 100644
--- a/plugins/power/csd-power-manager.c
+++ b/plugins/power/csd-power-manager.c
@@ -2519,7 +2519,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
@@ -2529,7 +2529,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
#endif
/* get the data */
- command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s",
+ command = g_strdup_printf ("/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %s",
argument,
manager->priv->backlight_helper_preference_args);
ret = g_spawn_command_line_sync (command,
@@ -2609,7 +2609,7 @@ backlight_helper_set_value (const gchar *argument,
@@ -2619,7 +2619,7 @@ backlight_helper_set_value (const gchar *argument,
#endif
/* get the data */
- command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-backlight-helper --%s %i %s",
+ command = g_strdup_printf ("pkexec " "/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %i %s",
argument, value,
manager->priv->backlight_helper_preference_args);
ret = g_spawn_command_line_sync (command,
diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
index 2c44e62..c0a2348 100755
--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
index 504f017..3569e8c 100644
--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
@@ -25,7 +25,7 @@
<allow_inactive>no</allow_inactive>
<allow_active>yes</allow_active>
@ -42,7 +42,8 @@ index 2c44e62..c0a2348 100755
- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/csd-backlight-helper</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper</annotate>
</action>
</policyconfig>
--
2.24.1
--
2.30.0

21
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
View File

@ -1,12 +1,9 @@
{ fetchFromGitHub
, autoconf-archive
, autoreconfHook
, cinnamon-desktop
, colord
, glib
, gsettings-desktop-schemas
, gtk3
, intltool
, lcms2
, libcanberra-gtk3
, libgnomekbd
@ -29,11 +26,15 @@
, tzdata
, nss
, libgudev
, meson
, ninja
, dbus
, dbus-glib
}:
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
version = "4.6.4";
version = "4.8.5";
/* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory
#include "csd-power-proxy.h"
@ -48,14 +49,15 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1xcjzjfwnzvkv9jiyw8adsjyhz92almzhyfwb91115774zgqnb7m";
hash = "sha256-PAWVTjGFs8yKXgNQ2ucDnEDS+n7bp2n3lhGl9gHXfdQ=";
};
patches = [
./csd-backlight-helper-fix.patch
./use-sane-install-dir.patch
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468
mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];
buildInputs = [
cinnamon-desktop
@ -85,13 +87,14 @@ stdenv.mkDerivation rec {
fontconfig
nss
libgudev
dbus
dbus-glib
];
nativeBuildInputs = [
autoconf-archive
autoreconfHook
meson
ninja
wrapGAppsHook
intltool
pkg-config
];

27
pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch Normal file
View File

@ -0,0 +1,27 @@
From be57c01e6595a8e08ecc17de298e30640b532f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 6 Feb 2021 13:55:03 +0100
Subject: [PATCH] use sane install-dir
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 0e11d50..54f4637 100644
--- a/meson.build
+++ b/meson.build
@@ -156,8 +156,8 @@ subdir('cinnamon-settings-daemon')
subdir('plugins')
install_subdir(
- 'files',
- install_dir: '/',
+ 'files/usr',
+ install_dir: get_option('prefix'),
strip_directory: true,
)
--
2.30.0

7
pkgs/desktops/cinnamon/cinnamon-translations/default.nix
View File

@ -1,17 +1,18 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, gettext
}:
stdenv.mkDerivation rec {
pname = "cinnamon-translations";
version = "4.6.2";
version = "4.8.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6";
hash = "sha256-o/JFfwloXLUOy9YQzHtMCuzK7yBp/G43VS/RguxiTPY=";
};
nativeBuildInputs = [

11
pkgs/desktops/cinnamon/cjs/default.nix
View File

@ -2,7 +2,8 @@
, fetchFromGitHub
, gobject-introspection
, pkg-config
, lib, stdenv
, lib
, stdenv
, wrapGAppsHook
, python3
, cairo
@ -27,14 +28,14 @@
}:
stdenv.mkDerivation rec {
pname = "cjs-unstable";
version = "2020-10-19";
pname = "cjs";
version = "4.8.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cjs";
rev = "befc11adb5ba10681464e6fa81b1a79f108ce61c";
hash = "sha256-F2t8uKV2r29NxX2+3mYp5x1bug2lwihJZTK1dSS8rPg=";
rev = version;
hash = "sha256-6+zlWL0DmyP+RFp1ECA4XGbgYUlsMqqyTd6z46w99Ug=";
};
outputs = [ "out" "dev" ];

4
pkgs/desktops/cinnamon/muffin/default.nix
View File

@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "muffin";
version = "4.6.3";
version = "4.8.1";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1p8irzf20wari1id5rfx5sypywih1jsrmn0f83zlyhc5fxg02r5p";
hash = "sha256-zRW+hnoaKKTe4zIJpY1D0Ahc8k5zRbvYBF5Y4vZ6Rbs=";
};
buildInputs = [

4
pkgs/desktops/cinnamon/nemo/default.nix
View File

@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "4.6.5";
version = "4.8.4";
# TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "04rgdph9pxdj5wzzv2i0pgyhg3s74nh9jf1ry9z6v5bvv222ili4";
hash = "sha256-OOPjxYrYUd1PIRxRgHwYbm7ennmAChbXqcM8MEPKXO0=";
};
outputs = [ "out" "dev" ];

1
pkgs/desktops/cinnamon/warpinator/default.nix
View File

@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec {
version = "1.0.8";
format = "other";
doCheck = false;
src = fetchFromGitHub {
owner = "linuxmint";