Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 85966e628d72
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1e0661cd6026
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 13, 2019

  1. 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: #50254
    @jtojnar
    jtojnar committed Mar 13, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0ea220b View commit details

Commits on Mar 15, 2019

  1. Merge pull request #57603 from jtojnar/wrap-gapps-hook-self-gio 

    wrapGAppsHook: add package’s own modules to GIO_EXTRA_MODULES
    @jtojnar
    jtojnar authored Mar 15, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1e0661c View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
4 changes: 4 additions & 0 deletions pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -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")