summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2021-05-22 23:22:35 +0200
committerMaciej Krüger <mkg20001@gmail.com>2021-05-22 23:59:34 +0200
commit77c27b6715531a3fc34fbcff3b340c55c0fd93f2 (patch)
tree66f98254262ef669a4f14ae12984d355780bf417
parenteac85651a3a44c5de3c024bc098fec2991903cd8 (diff)
downloadnixpkgs-77c27b6715531a3fc34fbcff3b340c55c0fd93f2.tar
nixpkgs-77c27b6715531a3fc34fbcff3b340c55c0fd93f2.tar.gz
nixpkgs-77c27b6715531a3fc34fbcff3b340c55c0fd93f2.tar.bz2
nixpkgs-77c27b6715531a3fc34fbcff3b340c55c0fd93f2.tar.lz
nixpkgs-77c27b6715531a3fc34fbcff3b340c55c0fd93f2.tar.xz
nixpkgs-77c27b6715531a3fc34fbcff3b340c55c0fd93f2.tar.zst
nixpkgs-77c27b6715531a3fc34fbcff3b340c55c0fd93f2.zip
cinnamon.cinnamon-session: use cinnamon-translations
-rw-r--r--pkgs/desktops/cinnamon/cinnamon-session/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix
index ba20bce4100..3f1ceb2dc61 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