From 2b8002e44babe44e3dba0cc623ffd1d22ba39daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Apr 2014 21:20:23 +0200
Subject: [PATCH] cinnamon: fixup gschemas

---
 pkgs/desktops/cinnamon/cinnamon-desktop.nix | 4 ----
 pkgs/desktops/cinnamon/cinnamon-session.nix | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
index e158b489884..d3cf04e835d 100644
--- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
@@ -22,10 +22,6 @@ stdenv.mkDerivation {
     xkeyboard_config libxkbfile libX11 libXrandr libXext
   ];
 
-  postInstall  = ''
-    ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
-  '';
-
   meta = {
     homepage = "http://cinnamon.linuxmint.com";
     description = "Library and data for various Cinnamon modules";
diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix
index 850dd4e6c5a..4caa95be061 100644
--- a/pkgs/desktops/cinnamon/cinnamon-session.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-session.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   };
 
 
-  configureFlags = "--disable-schemas-compile --enable-systemd --disable-gconf" ;
+  configureFlags = "--enable-systemd --disable-gconf" ;
 
   patches = [ ./remove-sessionmigration.patch ./timeout.patch];
 
@@ -23,17 +23,17 @@ stdenv.mkDerivation {
     gtk3 dbus_glib upower json_glib
     intltool systemd xorg.xtrans
     makeWrapper
+    cinnamon-desktop/*gschemas*/
    ];
 
   preBuild = "patchShebangs ./scripts";
 
 
-  postInstall  = ''
-    ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
+  postFixup  = ''
     rm $out/share/icons/hicolor/icon-theme.cache
 
     for f in "$out"/bin/*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:${cinnamon-desktop}/share"
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas:$GSETTINGS_SCHEMAS_PATH"
     done
   '';