From 0ea220b9bde0a8c1090f729a56517780980aac92 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Mar 2019 22:51:11 +0100 Subject: [PATCH] =?UTF-8?q?wrapGAppsHook:=20add=20package=E2=80=99s=20own?= =?UTF-8?q?=20modules=20to=20GIO=5FEXTRA=5FMODULES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index b5ceb4a13d8..906b1db9d10 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")