From f3536a0dcbff3ebf7020c46508926b2a4486e0ec Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 2 Dec 2013 09:24:08 +0100 Subject: [PATCH 1/3] broken translation files --- .../cinnamon/cinnamon-translations.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cinnamon-translations.nix diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix new file mode 100644 index 00000000000..09e656943ad --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "cinnamon-translations"; + version="2.0.3"; + + src = fetchurl { + url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"; + sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc"; + }; + + + installPhase = + '' + mkdir -pv $out/usr/share/cinnamon/locale + cp -Rp mo-export/* $out/usr/share/cinnamon/locale/ + ''; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "Translations files for the Cinnamon desktop" ; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac304ad462b..31d4426ba66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9575,6 +9575,10 @@ let ### DESKTOP ENVIRONMENTS + + cinnamon = recurseIntoAttrs { + cjs = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; + }; enlightenment = callPackage ../desktops/enlightenment { }; From 28d24ea4ebc68fe9d890ba41694549a5268fc234 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 2 Dec 2013 13:25:38 +0100 Subject: [PATCH 2/3] cinnamon-transalations working --- pkgs/desktops/cinnamon/cinnamon-translations.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix index 09e656943ad..2d396947b89 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -pv $out/usr/share/cinnamon/locale - cp -Rp mo-export/* $out/usr/share/cinnamon/locale/ + cp -av mo-export/* $out/usr/share/cinnamon/locale/ ''; meta = { From a12367d991f7d04af743a92b216c281d9fafa383 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 2 Dec 2013 13:29:45 +0100 Subject: [PATCH 3/3] changed wrong name in all-packages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31d4426ba66..9237f1736a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9577,7 +9577,7 @@ let ### DESKTOP ENVIRONMENTS cinnamon = recurseIntoAttrs { - cjs = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; + cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; }; enlightenment = callPackage ../desktops/enlightenment { };