diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-03-04 22:38:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 22:38:17 +0000 |
| commit | 0d877fbb2932ebfaf0b936db473a541ea6eba476 (patch) | |
| tree | 7b955d23709b4c224e4a4e19c5537d297a324782 | |
| parent | 1a44e325d2b4d9d487f469e7f0ca2af73c8b270d (diff) | |
| parent | 8e4f502fc6a3736f402e320ba7ab3ec630a4cbac (diff) | |
| download | nixlib-0d877fbb2932ebfaf0b936db473a541ea6eba476.tar nixlib-0d877fbb2932ebfaf0b936db473a541ea6eba476.tar.gz nixlib-0d877fbb2932ebfaf0b936db473a541ea6eba476.tar.bz2 nixlib-0d877fbb2932ebfaf0b936db473a541ea6eba476.tar.lz nixlib-0d877fbb2932ebfaf0b936db473a541ea6eba476.tar.xz nixlib-0d877fbb2932ebfaf0b936db473a541ea6eba476.tar.zst nixlib-0d877fbb2932ebfaf0b936db473a541ea6eba476.zip | |
Merge pull request #81759 from jtojnar/gio-wgah-order-hack
glib.setupHook: run glibPreFixupPhase before gappsWrapperArgsHook
| -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 37c750b8db66..5d9c330b62eb 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 |