diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-03-13 22:51:11 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-03-13 23:03:53 +0100 |
| commit | 0ea220b9bde0a8c1090f729a56517780980aac92 (patch) | |
| tree | 347758c525a041bce51d9c51341d15b4ff324d39 /pkgs/build-support | |
| parent | de4f6d15302907de6905e9b3cb411d4ed170c462 (diff) | |
| download | nixlib-0ea220b9bde0a8c1090f729a56517780980aac92.tar nixlib-0ea220b9bde0a8c1090f729a56517780980aac92.tar.gz nixlib-0ea220b9bde0a8c1090f729a56517780980aac92.tar.bz2 nixlib-0ea220b9bde0a8c1090f729a56517780980aac92.tar.lz nixlib-0ea220b9bde0a8c1090f729a56517780980aac92.tar.xz nixlib-0ea220b9bde0a8c1090f729a56517780980aac92.tar.zst nixlib-0ea220b9bde0a8c1090f729a56517780980aac92.zip | |
wrapGAppsHook: add package’s own modules to GIO_EXTRA_MODULES
When a package provides both executables and gio modules, it is quite probable the executables will need those modules. wrapGAppsHook wraps executables with GIO_EXTRA_MODULES picked up from dependencies but forgets about the package being built. Let’s add to consideration. Closes: https://github.com/NixOS/nixpkgs/issues/50254
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 4 |
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") |