From df8ee064772e6dde062a5fc91d96557eaec4f8a2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Nov 2018 14:02:56 -0600 Subject: glib: only add gsettingsschemadir in make MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/ --- pkgs/development/libraries/glib/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/glib') 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" -- cgit 1.4.1