about summary refs log tree commit diff
path: root/pkgs/development/libraries/glib
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-14 14:02:56 -0600
committerMatthew Bauer <mjbauer95@gmail.com>2018-11-14 14:02:56 -0600
commitdf8ee064772e6dde062a5fc91d96557eaec4f8a2 (patch)
treededab6ef0f38cbf3a11001f0705fd20d01469cbc /pkgs/development/libraries/glib
parentd3751930570ae5dcd32d423b9fd384b9958cfb65 (diff)
downloadnixlib-df8ee064772e6dde062a5fc91d96557eaec4f8a2.tar
nixlib-df8ee064772e6dde062a5fc91d96557eaec4f8a2.tar.gz
nixlib-df8ee064772e6dde062a5fc91d96557eaec4f8a2.tar.bz2
nixlib-df8ee064772e6dde062a5fc91d96557eaec4f8a2.tar.lz
nixlib-df8ee064772e6dde062a5fc91d96557eaec4f8a2.tar.xz
nixlib-df8ee064772e6dde062a5fc91d96557eaec4f8a2.tar.zst
nixlib-df8ee064772e6dde062a5fc91d96557eaec4f8a2.zip
glib: only add gsettingsschemadir in make
gsettingsschemedir only works in make where you can set any variable
from the command line as in “make VAR=VAL”. Other build systems may
not support this kind of loose overriding of variables. This broke a
scons build here:

  https://hydra.nixos.org/build/84073119/
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r--pkgs/development/libraries/glib/setup-hook.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index 233845c6541f..5275529991f7 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -9,7 +9,7 @@ addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas
 
 # Install gschemas, if any, in a package-specific directory
 glibPreInstallPhase() {
-  installFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
+  makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
 }
 preInstallPhases+=" glibPreInstallPhase"