diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-04 21:19:35 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-04 21:51:26 +0100 |
| commit | 8e4f502fc6a3736f402e320ba7ab3ec630a4cbac (patch) | |
| tree | 7b955d23709b4c224e4a4e19c5537d297a324782 /pkgs/development/libraries/glib | |
| parent | 1a44e325d2b4d9d487f469e7f0ca2af73c8b270d (diff) | |
| download | nixpkgs-8e4f502fc6a3736f402e320ba7ab3ec630a4cbac.tar nixpkgs-8e4f502fc6a3736f402e320ba7ab3ec630a4cbac.tar.gz nixpkgs-8e4f502fc6a3736f402e320ba7ab3ec630a4cbac.tar.bz2 nixpkgs-8e4f502fc6a3736f402e320ba7ab3ec630a4cbac.tar.lz nixpkgs-8e4f502fc6a3736f402e320ba7ab3ec630a4cbac.tar.xz nixpkgs-8e4f502fc6a3736f402e320ba7ab3ec630a4cbac.tar.zst nixpkgs-8e4f502fc6a3736f402e320ba7ab3ec630a4cbac.zip | |
glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook
Since we split wrapGAppsHook and move its variable initialization to preFixupPhases in #81475, it was getting run before glibPreFixupPhase which sets GSETTINGS_SCHEMAS_PATH variable gappsWrapperArgsHook depends on. Let's introduce this ugly hack to ensure glibPreFixupPhase will run before gappsWrapperArgsHook.
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/setup-hook.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index 37c750b8db6..5d9c330b62e 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -24,4 +24,12 @@ glibPreFixupPhase() { addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" } -preFixupPhases+=" glibPreFixupPhase" + +# gappsWrapperArgsHook expects GSETTINGS_SCHEMAS_PATH variable to be set by this. +# Until we have dependency mechanism in generic builder, we need to use this ugly hack. +if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then + preFixupPhases+=" " + preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / glibPreFixupPhase gappsWrapperArgsHook }" +else + preFixupPhases+=" glibPreFixupPhase" +fi |