From b36ed39f2ea78227719505189bd90ebf11a63165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Dec 2013 14:27:21 +0100
Subject: [PATCH] cinnamon: various fixes

cinnamon-translations: use $out/share instead of $out/usr/share,
add version into name

all-packages.nix: refactor
---
 .../cinnamon/cinnamon-translations.nix         | 18 ++++++++----------
 pkgs/top-level/all-packages.nix                | 17 ++++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix
index 2d396947b89..a68a905f92e 100644
--- a/pkgs/desktops/cinnamon/cinnamon-translations.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "cinnamon-translations";
-  version="2.0.3";
+{ stdenv, fetchurl }:
+let
+  version = "2.0.3";
+in
+stdenv.mkDerivation {
+  name = "cinnamon-translations-${version}";
 
   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/
+      mkdir -pv $out/share/cinnamon/locale
+      cp -av mo-export/* $out/share/cinnamon/locale/
     '';
 
   meta = {
@@ -25,5 +25,3 @@ stdenv.mkDerivation rec {
   };
 }
 
-
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c101ed918a..eccce1181de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9586,17 +9586,16 @@ let
 
 
   ### DESKTOP ENVIRONMENTS
-  
-   cinnamon = recurseIntoAttrs {
-    cinnamon-translations  = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
-    }; 
 
-  cinnamon = recurseIntoAttrs {
+  cinnamon = recurseIntoAttrs rec {
+    callPackage = newScope pkgs.cinnamon;
+    inherit (gnome3) gnome_common;
+
+    cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { };
+
+    cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
+
     cjs = callPackage ../desktops/cinnamon/cjs.nix { };
-
-    cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix {
-      inherit (gnome3) gnome_common;
-    };
   };
 
   enlightenment = callPackage ../desktops/enlightenment { };