git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #124056 from mkg20001/cinnamonlocale

nixos/cinnamon: add cinnamon-translations to systemPackages

commit141e85cc697538e2476d0c81f6e5d5153bd220cd authorJan Tojnar <jtojnar@gmail.com> dateSun 23 May 2021, 00:21 (5 years ago) parent939c4c156dbdba
6 files changed+28−3
nixos/modules/services/x11/desktop-managers/cinnamon.nix+1 pkgs/desktops/cinnamon/cinnamon-common/default.nix+5−1 pkgs/desktops/cinnamon/cinnamon-control-center/default.nix+4 pkgs/desktops/cinnamon/cinnamon-session/default.nix+9−2 pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix+6 pkgs/desktops/cinnamon/nemo/default.nix+3
nixos/modules/services/x11/desktop-managers/cinnamon.nix+1
@@ -128,6 +128,7 @@ in
128128 cinnamon-session
129129 cinnamon-desktop
130130 cinnamon-menus
131+ cinnamon-translations
131132
132133 # utils needed by some scripts
133134 killall
pkgs/desktops/cinnamon/cinnamon-common/default.nix+5−1
@@ -6,6 +6,7 @@
66, cinnamon-desktop
77, cinnamon-menus
88, cinnamon-session
9+, cinnamon-translations
910, cjs
1011, fetchFromGitHub
1112, gdk-pixbuf
@@ -115,7 +116,10 @@ stdenv.mkDerivation rec {
115116 gtk-doc
116117 ];
117118
118− configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ];
119+ # use locales from cinnamon-translations (not using --localedir because datadir is used)
120+ postInstall = ''
121+ ln -s ${cinnamon-translations}/share/locale $out/share/locale
122+ '';
119123
120124 postPatch = ''
121125 find . -type f -exec sed -i \
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix+4
@@ -28,6 +28,7 @@
2828, gdk-pixbuf
2929, meson
3030, ninja
31+, cinnamon-translations
3132}:
3233
3334stdenv.mkDerivation rec {
@@ -83,7 +84,10 @@ stdenv.mkDerivation rec {
8384 '';
8485
8586 mesonFlags = [
87+ # TODO: https://github.com/NixOS/nixpkgs/issues/36468
8688 "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
89+ # use locales from cinnamon-translations
90+ "--localedir=${cinnamon-translations}/share/locale"
8791 ];
8892
8993 preInstall = ''
pkgs/desktops/cinnamon/cinnamon-session/default.nix+9−2
@@ -1,6 +1,7 @@
11{ fetchFromGitHub
22, cinnamon-desktop
33, cinnamon-settings-daemon
4+, cinnamon-translations
45, dbus-glib
56, docbook_xsl
67, docbook_xml_dtd_412
@@ -80,8 +81,14 @@ stdenv.mkDerivation rec {
8081 xmlto
8182 ];
8283
83− # TODO: https://github.com/NixOS/nixpkgs/issues/36468
84− mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" "-DENABLE_IPV6=true" ];
84+ mesonFlags = [
85+ # TODO: https://github.com/NixOS/nixpkgs/issues/36468
86+ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
87+ "-Dgconf=false"
88+ "-DENABLE_IPV6=true"
89+ # use locales from cinnamon-translations
90+ "--localedir=${cinnamon-translations}/share/locale"
91+ ];
8592
8693 postPatch = ''
8794 chmod +x data/meson_install_schemas.py # patchShebangs requires executable file
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix+6
@@ -1,5 +1,6 @@
11{ fetchFromGitHub
22, cinnamon-desktop
3+, cinnamon-translations
34, colord
45, glib
56, gsettings-desktop-schemas
@@ -104,6 +105,11 @@ stdenv.mkDerivation rec {
104105 sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h
105106 '';
106107
108+ # use locales from cinnamon-translations (not using --localedir because datadir is used)
109+ postInstall = ''
110+ ln -s ${cinnamon-translations}/share/locale $out/share/locale
111+ '';
112+
107113 # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper
108114 postFixup = ''
109115 mkdir -p $out/bin/cinnamon-settings-daemon
pkgs/desktops/cinnamon/nemo/default.nix+3
@@ -16,6 +16,7 @@
1616, exempi
1717, intltool
1818, shared-mime-info
19+, cinnamon-translations
1920}:
2021
2122stdenv.mkDerivation rec {
@@ -57,6 +58,8 @@ stdenv.mkDerivation rec {
5758 mesonFlags = [
5859 # TODO: https://github.com/NixOS/nixpkgs/issues/36468
5960 "-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
61+ # use locales from cinnamon-translations
62+ "--localedir=${cinnamon-translations}/share/locale"
6063 ];
6164
6265 meta = with lib; {