Merge pull request #124056 from mkg20001/cinnamonlocale

nixos/cinnamon: add cinnamon-translations to systemPackages
This commit is contained in:
Jan Tojnar 2021-05-23 00:21:11 +02:00 committed by GitHub
commit 141e85cc69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 3 deletions

View file

@ -128,6 +128,7 @@ in
cinnamon-session
cinnamon-desktop
cinnamon-menus
cinnamon-translations
# utils needed by some scripts
killall

View file

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

View file

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

View file

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

View file

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

View file

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