about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-03-15 14:26:17 +0100
committerGitHub <noreply@github.com>2019-03-15 14:26:17 +0100
commit1e0661cd60269f6910285997485a50215e226e19 (patch)
tree785f42b751a1e9a18326a4ca20d0475062da6b18 /pkgs/build-support
parent85966e628d72fc505209b00f46affd6592fd62c0 (diff)
parent0ea220b9bde0a8c1090f729a56517780980aac92 (diff)
downloadnixlib-1e0661cd60269f6910285997485a50215e226e19.tar
nixlib-1e0661cd60269f6910285997485a50215e226e19.tar.gz
nixlib-1e0661cd60269f6910285997485a50215e226e19.tar.bz2
nixlib-1e0661cd60269f6910285997485a50215e226e19.tar.lz
nixlib-1e0661cd60269f6910285997485a50215e226e19.tar.xz
nixlib-1e0661cd60269f6910285997485a50215e226e19.tar.zst
nixlib-1e0661cd60269f6910285997485a50215e226e19.zip
Merge pull request #57603 from jtojnar/wrap-gapps-hook-self-gio
wrapGAppsHook: add package’s own modules to GIO_EXTRA_MODULES
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/setup-hooks/wrap-gapps-hook.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index b5ceb4a13d85..906b1db9d10e 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -30,6 +30,10 @@ wrapGAppsHook() {
     gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
   fi
 
+  if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
+    gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
+  fi
+
   for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
     eval local dummy="\$$v"
     gappsWrapperArgs+=(--prefix $v : "$dummy")