cinnamon.cinnamon-control-center: 5.4.4 -> 5.4.6
Upstream don't really add gio-unix-2.0 as dependency when doing gdbus_codegen so this regressed again :-(
This commit is contained in:
parent
a6d4e3d86a
commit
880e4a8e24
@ -1,7 +1,6 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, glib
|
, glib
|
||||||
, gettext
|
, gettext
|
||||||
@ -18,6 +17,7 @@
|
|||||||
, libgnomekbd
|
, libgnomekbd
|
||||||
, libxklavier
|
, libxklavier
|
||||||
, networkmanager
|
, networkmanager
|
||||||
|
, libgudev
|
||||||
, libwacom
|
, libwacom
|
||||||
, gnome
|
, gnome
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
@ -36,22 +36,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cinnamon-control-center";
|
pname = "cinnamon-control-center";
|
||||||
version = "5.4.4";
|
version = "5.4.6";
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Add missing gio-unix-2.0 dependency, can be removed on next update
|
|
||||||
# https://github.com/linuxmint/cinnamon-control-center/pull/294
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/linuxmint/cinnamon-control-center/commit/7f5ba6e7a691547840f8482445c09c729e10a397.patch";
|
|
||||||
sha256 = "sha256-xcf/O/DfhOvCpWJl0XZD+xAwWs4STAeCaFMZ9Lftv2w=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linuxmint";
|
owner = "linuxmint";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-c2JbRAMcTnqaqt8MXQl4AxnENVmfYyHcCteWBWQUSO0=";
|
hash = "sha256-8BDmQT/xDnpwR2YC0TGaqWPnZ61IBmVvft2Mcf6YN+A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -66,6 +57,7 @@ stdenv.mkDerivation rec {
|
|||||||
libxklavier
|
libxklavier
|
||||||
colord
|
colord
|
||||||
cinnamon-settings-daemon
|
cinnamon-settings-daemon
|
||||||
|
libgudev
|
||||||
libwacom
|
libwacom
|
||||||
gnome-online-accounts
|
gnome-online-accounts
|
||||||
tzdata
|
tzdata
|
||||||
@ -98,6 +90,8 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
|
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
|
||||||
|
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
|
||||||
# use locales from cinnamon-translations
|
# use locales from cinnamon-translations
|
||||||
"--localedir=${cinnamon-translations}/share/locale"
|
"--localedir=${cinnamon-translations}/share/locale"
|
||||||
];
|
];
|
||||||
|
Loading…
Reference in New Issue
Block a user