Commit graph

90 commits

Author SHA1 Message Date
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Jan Tojnar 58c6cbf78b
gobject-introspection: 1.66.1 → 1.68.0
Co-Authored-By: Maxine Aubrey <maxeaubrey@gmail.com>
2021-05-05 22:20:22 +02:00
Jan Tojnar 7d535edec5
gnome3: support new versioning scheme in the update script
https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235
2021-05-05 22:20:20 +02:00
Ben Siraphob 66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jan Tojnar 1e314c363d
gobject-introspection: 1.66.0 → 1.66.1
Fix vips build.
2020-10-24 03:48:19 +02:00
Doron Behar 469db7ce0e
gobject-introspection: 1.64.1 -> 1.66.0 2020-10-24 01:14:04 +02:00
Jan Tojnar c9857dee7d
gobject-introspection: move build tools to nativeBuildInputs 2020-05-17 22:28:06 +02:00
Jan Tojnar fd5ea9d5f2
gobject-introspection: add docs 2020-05-15 21:32:37 +02:00
Jan Tojnar e4a009a109
gobject-introspection: consolidate patches
and add comments
2020-05-15 21:04:31 +02:00
Jan Tojnar fbb86b1fa8
gobject-introspection: more clean-ups
* remove glibcLocales now that glibc contains C.UTF-8
* remove libintl, that should be in by default or something
* update homepage
* add gnome team to maintainers
* remove the temporary libregress closer its creation
2020-05-15 21:03:20 +02:00
Jan Tojnar 1bc7b68b1c
gobject-introspection: clean up the expression
* format with nixpkgs-fmt
* reorder the attributes
* use pkg-config instead of the pkgconfig alias
* optional → optionals
* remove top-level `with lib;`
2020-05-15 19:57:40 +02:00
Jan Tojnar 8f7387f219
gobject-introspection: Ensure the giDiscoverSelf is run before gappsWrapperArgsHook
gappsWrapperArgsHook tries to collect GI_TYPELIB_PATH environment variable so if we want it to see the path giDiscoverSelf adds, we need to force the order.
2020-04-30 20:12:30 +02:00
Jan Tojnar b4a6714571
Merge branch 'staging-next' into staging 2020-04-13 18:54:59 +02:00
Jan Tojnar a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Tor Hedin Brønner 247bddd311 gobject-introspection: 1.64.0 -> 1.64.1 2020-04-08 09:52:37 +02:00
Jan Tojnar 52f82285f6
gobject-introspection: Clean libregress symlink
Adding phases to preInstallPhases is not possible in preBuild since by that time, phases is already populated.
2020-04-05 00:02:54 +02:00
Jan Tojnar 48271f8db9
gobject-introspection: fix tests on darwin
We need to use platform specific shared library file extension when doing our symlink hack.
2020-04-04 04:07:29 +02:00
Tor Hedin Brønner 990b331734
gobject-introspection: 1.62.0 -> 1.64.0
- cairo and doctool is now auto features

Disable broken test. It tries to look up libs in their installed
location, which aren't accessible yet.
2020-03-24 07:06:58 +01:00
Tor Hedin Brønner 99fb5e3668 gobject-introspection: 1.60.2 → 1.62.0 2019-09-30 19:39:46 +02:00
R. RyanTM 76a765d1a1 gobject-introspection: 1.60.1 -> 1.60.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gobject-introspection/versions
2019-07-01 09:45:42 -07:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Tor Hedin Brønner d747f1602d gobject-introspection: 1.60.0 -> 1.60.1
Updated the shlib patches:

- Upstream now forces basename in sanitize_shlib_path(lib) if the system isn't
  darwin. We patch the function to always prefer absolute paths
- Due to the above we no longer need the macos patch
- `sanitize_shlib_path` is applied after `resolve_from_ldd_output` so we need to
  apply `fallback_libpath` afterwards too (else we get stuff like
  `/nix/store/...@rpath/foo.dylib` on darwin)
- Note that the `fallback_path` no longer have any unit tests

https://gitlab.gnome.org/GNOME/gobject-introspection/blob/1.60.1/NEWS
2019-04-27 07:09:47 +02:00
Tor Hedin Brønner cd9aaebb78
gobject-introspection: disable tests on aarch64 2019-04-05 12:13:53 +02:00
Tor Hedin Brønner f3911d3ff2
gobject-introspection: 1.58.3 -> 1.60.0 2019-04-05 11:39:59 +02:00
Jan Tojnar b766ec29a7
gobject-introspection.setupHook: limit XDG_DATA_DIRS
The setup hook was adding share directory to XDG_DATA_DIRS variable whenever
it existed, even when gir-1.0 subdirectory did not.
2019-01-20 04:04:44 +01:00
Will Dietz 21e32e803d gobject-introspection: 1.58.2 -> 1.58.3 2018-12-30 22:18:42 -06:00
Jan Tojnar 5e27842c8c
gobject-introspection: 1.58.1 → 1.58.2 2018-12-12 00:45:00 +01:00
Jan Tojnar a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Tor Hedin Brønner 338b3fd11d
gobjectIntrospection: test our own patches
We patch gobject-introspection somewhat heavily, so add some unit tests that
will catch potential errors when we're eg. updating the patches.

There's two tests:

- Basic test for absolute nix store paths (testing absolute_shlib_path.patch)
- Test for macos `@rpath` sanitizing, including
  fallback_libpath (macos-shared-library.patch)
2018-11-30 21:35:30 +01:00
Jan Tojnar fe4b53b8c3
gobjectIntrospection: 1.56.0 → 1.58.1
Upstream now strips absolute paths to their basename on all platforms apart from
Darwin: a41abe1868

To get around this without modifying the basename test we simply pass in
`basename=False` when normally generating gir files.
2018-11-30 21:34:25 +01:00
Matthew Bauer 67b7a57e30
Merge pull request #46310 from hamishmack/gobject-introspection-macos
gobject-introspection: Fix macos shared lib paths
2018-11-21 15:39:38 -06:00
Markus Kowalewski 154e9e11f7
gobject-introspection: add licenses 2018-10-08 23:10:04 +02:00
Jan Tojnar 5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
Hamish Mackenzie 363f78fb4c gobject-introspection: Fix macos shared lib paths
Uses patch Nirbheek Chauhan's patch from this issue upstream issue:
https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222

Fixes #40599
2018-09-07 22:17:06 +12:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Matthew Bauer ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Jan Tojnar 0973618e4e
gnome3: automated update 2018-03-22 07:46:42 +01:00
Jan Tojnar e468c04383
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
2018-03-22 07:46:00 +01:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Jan Tojnar 91db9292fa
gobjectIntrospection: add updateScript 2018-03-04 20:05:52 +01:00
Shea Levy c54730dde8
gobjectIntrospection: Enable building without X11 support.
Also disable it when noXlibs in NixOS.
2018-03-01 07:36:36 -05:00
Jan Tojnar e44038bcca
gobjectIntrospection: use absolute path for cairo GIR
Cairo does not provide its own GObject bindinds so they are provided
by gobject-introspection package. Unfortunately, this means that if we
want to use the absolute path, we need gi to depend on cairo, which
increases the closure size from 41M to 56M. We will probably want
to split the typelib into a separate output.

Closes: #34080
2018-01-20 15:58:20 +01:00
Yegor Timoshenko d3e821156e
Merge pull request #31094 from yegortimoshenko/ibus/update
ibus: 1.5.16 -> 1.5.17, fix
2017-12-31 21:23:05 +03:00
John Ericson 046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Yegor Timoshenko 0dff26daa4
gobjectIntrospection: add giDiscoverSelf preFixupPhase hook
Some derivations need to discover their own typelibs. giDiscoverSelf
runs as a preFixupPhase and populates GI_TYPELIB_PATH with an entry
pointing to $prefix/lib/girepository-1.0, if it exists.
2017-12-30 02:57:37 +00:00
Jan Tojnar c2bc772203
gobjectIntrospection: 1.52.1 → 1.54.1 2017-11-05 20:44:12 +01:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Linus Heckemann b73e3b6095 GNOME: 3.22 -> 3.24
This is a squash commit of the joint work from:

* Jan Tojnar (@jtojnar)
* Linus Heckemann (@lheckemann)
* Ryan Mulligan (@ryantm)
* romildo (@romildo)
* Tom Hunger (@teh)
2017-08-28 15:32:49 +01:00
Hamish Mackenzie da1d13bc07 webkgitgtk: fix 2.14 on macOS
Includes the patches from macports and fixes an issue with the
`otool -L` output that was causing g-ir-scanner to fail.
The paths in the macports patches have been modified so that they
will work with `patches` in nix (an extra directory level was
added).
2017-04-10 23:11:16 -07:00