From eca2b053544e92ba07ae31a6178c19a54c210a64 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sat, 22 May 2021 20:30:03 +0200 Subject: nixos/cinnamon: add cinnamon-translations to systemPackages This allows other cinnamon applications to use the locales Without this the cinnamon UI is not properly translated --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 43220e3c5952c..8dcf8a6033d76 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -128,6 +128,7 @@ in cinnamon-session cinnamon-desktop cinnamon-menus + cinnamon-translations # utils needed by some scripts killall -- cgit 1.4.1 From 425ac82c146758f9508b660f9892007099133e99 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sat, 22 May 2021 23:21:56 +0200 Subject: cinnamon.cinnamon-common: use cinnamon-translations Also remove unused configureFlags --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index a5800b01a3036..5fdfc0db1d69f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -6,6 +6,7 @@ , cinnamon-desktop , cinnamon-menus , cinnamon-session +, cinnamon-translations , cjs , fetchFromGitHub , gdk-pixbuf @@ -115,7 +116,10 @@ stdenv.mkDerivation rec { gtk-doc ]; - configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ]; + # 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 \ -- cgit 1.4.1 From eac85651a3a44c5de3c024bc098fec2991903cd8 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sat, 22 May 2021 23:22:13 +0200 Subject: cinnamon.cinnamon-control-center: use cinnamon-translations --- pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 4208b92ae2d55..94080e3e47a32 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -28,6 +28,7 @@ , gdk-pixbuf , meson , ninja +, cinnamon-translations }: stdenv.mkDerivation rec { @@ -83,7 +84,10 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + # use locales from cinnamon-translations + "--localedir=${cinnamon-translations}/share/locale" ]; preInstall = '' -- cgit 1.4.1 From 77c27b6715531a3fc34fbcff3b340c55c0fd93f2 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sat, 22 May 2021 23:22:35 +0200 Subject: cinnamon.cinnamon-session: use cinnamon-translations --- pkgs/desktops/cinnamon/cinnamon-session/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index ba20bce4100d8..3f1ceb2dc6108 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -1,6 +1,7 @@ { fetchFromGitHub , cinnamon-desktop , cinnamon-settings-daemon +, cinnamon-translations , dbus-glib , docbook_xsl , docbook_xml_dtd_412 @@ -80,8 +81,14 @@ stdenv.mkDerivation rec { xmlto ]; - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" "-DENABLE_IPV6=true" ]; + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + "-Dgconf=false" + "-DENABLE_IPV6=true" + # use locales from cinnamon-translations + "--localedir=${cinnamon-translations}/share/locale" + ]; postPatch = '' chmod +x data/meson_install_schemas.py # patchShebangs requires executable file -- cgit 1.4.1 From 4a3651243121222a8729c0b8be40fd23f37766de Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sat, 22 May 2021 23:22:51 +0200 Subject: cinnamon.cinnamon-settings-daemon: use cinnamon-translations --- pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 3df8760c8582b..69b08fc64ed99 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub , cinnamon-desktop +, cinnamon-translations , colord , glib , gsettings-desktop-schemas @@ -104,6 +105,11 @@ stdenv.mkDerivation rec { sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h ''; + # use locales from cinnamon-translations (not using --localedir because datadir is used) + postInstall = '' + ln -s ${cinnamon-translations}/share/locale $out/share/locale + ''; + # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper postFixup = '' mkdir -p $out/bin/cinnamon-settings-daemon -- cgit 1.4.1 From 56dbdba0cc9e0a7f33417837246484a1815091ce Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sat, 22 May 2021 23:23:06 +0200 Subject: cinnamon.nemo: use cinnamon-translations --- pkgs/desktops/cinnamon/nemo/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 482fb402e4d35..806ca5d664ee7 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -16,6 +16,7 @@ , exempi , intltool , shared-mime-info +, cinnamon-translations }: stdenv.mkDerivation rec { @@ -57,6 +58,8 @@ stdenv.mkDerivation rec { mesonFlags = [ # TODO: https://github.com/NixOS/nixpkgs/issues/36468 "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + # use locales from cinnamon-translations + "--localedir=${cinnamon-translations}/share/locale" ]; meta = with lib; { -- cgit 1.4.1