Merge branch 'master' into x-updates

Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix

1 files changed, 29 insertions, 0 deletions

diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix
new file mode 100644
index 000000000000..2d396947b893
--- /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 -av 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 ];
+  };
+}
+
+
+