From 92725618b2f859b27037fd4ef14bf56b4d9fb924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 8 Jun 2015 13:12:18 +0200
Subject: [PATCH] Revert "glib hooks: move gsettings-schemas if on wrong place"

This reverts commit 5df1aadd68a157997c5ff419a8f4e1db23e5a5ae.

It introduced some problems.
---
 pkgs/development/libraries/glib/setup-hook.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index 8d63af6b9b4..f173744e5ca 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -10,15 +10,8 @@ make_glib_find_gsettings_schemas() {
 
 envHooks+=(make_glib_find_gsettings_schemas)
 
-glibFixupPhase() {
-    # Move gschemas in case the install flag didn't help
-    if [ -d "$prefix/share/glib-2.0/schemas" ]; then
-        mkdir -p "$prefix/share/gsettings-schemas/$name/glib-2.0"
-        mv "$prefix/share/glib-2.0/schemas" "$prefix/share/gsettings-schemas/$name/glib-2.0/"
-    fi
-
-    addToSearchPath GSETTINGS_SCHEMAS_PATH "$prefix/share/gsettings-schemas/$name"
+glibPreFixupPhase() {
+    addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
 }
 
-fixupOutputHooks+=(glibFixupPhase)
-
+preFixupPhases="$preFixupPhases glibPreFixupPhase"