diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-18 17:28:06 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 07:46:00 +0100 |
commit | e468c04383061590d949f2fcb360926cc88085c7 (patch) | |
tree | 69d872a6e298c8a7169782f190910f1257129dd8 /pkgs/desktops/gnome-3/core/gnome-software | |
parent | 3abd1ec53d4d373f2fd1b697bc9ea191137e5d19 (diff) | |
download | nixlib-e468c04383061590d949f2fcb360926cc88085c7.tar nixlib-e468c04383061590d949f2fcb360926cc88085c7.tar.gz nixlib-e468c04383061590d949f2fcb360926cc88085c7.tar.bz2 nixlib-e468c04383061590d949f2fcb360926cc88085c7.tar.lz nixlib-e468c04383061590d949f2fcb360926cc88085c7.tar.xz nixlib-e468c04383061590d949f2fcb360926cc88085c7.tar.zst nixlib-e468c04383061590d949f2fcb360926cc88085c7.zip |
gobjectIntrospection: fix incorrect GIR shared library paths
When a library path contained the library name it was eagerly matched libfwupd.so.2 => /build/fwupd-1.0.5/build/libfwupd/libfwupd.so.2 (0x00007ffff7bbd000) ^^^^^^^^^^^^^^^^^^^^^^ libgweather-3.so.15 => /build/libgweather-3.28.0/build/libgweather/libgweather-3.so.15 (0x00007ffff7bae000) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ which lead to a broken shared library path in the generated GIR file. This patch allows the soname on the left-hand side of the arrow to be matched to avoid the trap of the right-hand side. A negative lookahead had to be added to select the store path, since only the first match is taken into account. libglib-2.0.so.0 => /nix/store/dqlc8y4phlg1hmdbwkhqfwhnxcac88d1-glib-2.56.0/lib/libglib-2.0.so.0 (0x00007ffff6400000) This will not fix non-GNU platforms, where the soname is not printed first, but we cannot do much without structured ldd output. Closes: https://github.com/NixOS/nixpkgs/issues/34988
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-software')
0 files changed, 0 insertions, 0 deletions