Commit Graph

133 Commits

Author SHA1 Message Date
Nick Cao
3daee4c5ee
meson: cleanup after https://github.com/NixOS/nixpkgs/pull/214046 2023-02-03 14:02:22 +08:00
Stéphan Kochen
9ac97a794f meson: fix checks on darwin 2023-02-02 13:20:21 +01:00
Nick Cao
022c01aa39
meson: run project tests 2023-01-26 13:53:26 +08:00
Nick Cao
333ffb5d4a
meson: 0.64.1 -> 1.0.0 2023-01-26 11:09:49 +08:00
Anderson Torres
ff3a815398
Merge pull request #211730 from ShamrockLee/meson-wrap
meson: patch bash completion file to access python3 (resumed)
2023-01-24 13:41:59 -03:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Shamrock Lee
610256a6c3 meson.src: use hash instead of sha256 as its input parameter 2023-01-20 05:10:03 +08:00
Shamrock Lee
5f0b4eb01e meson: patch bash completion file to access python3 2023-01-20 05:10:03 +08:00
Arnout Engelen
6165976b7d meson: 0.63.1 -> 0.64.1 2022-11-24 16:18:36 +02:00
Jan Tojnar
dd86663a26
Merge pull request #197754 from jtojnar/gnome-staging
More GNOME updates (staging)
2022-10-29 14:57:36 +02:00
Jan Tojnar
9629c0577a Revert "meson: expose python3 in passthru"
IMO Meson’s Python should not be exposed at all.

This reverts commit 38f48cfc4f.
2022-10-26 08:49:26 +02:00
Jan Tojnar
0b5be61ca1 glib: 2.74.0 → 2.74.1
https://gitlab.gnome.org/GNOME/glib/-/compare/2.74.0...2.74.1

- Docs no longer can be generated in static builds.
- Drop merged patches.
- Add a comment to an undocumented patch.
- Drop huge with statement.
- Drop meson override not needed since a4a300dfff

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-10-25 18:16:48 +02:00
Jan Tojnar
d83a3d03a3 meson: Use explicit setup subcommand
Fix the following warning in Meson 0.64:

WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.

Introduced in 3c7ab542c0
2022-09-28 03:20:51 +02:00
Robert Scott
38f48cfc4f meson: expose python3 in passthru 2022-09-17 00:14:01 +01:00
Jan Tojnar
e442c9084b meson: 0.63.0 → 0.63.1
https://github.com/mesonbuild/meson/compare/0.63.0...0.63.1
2022-08-15 19:45:28 +02:00
Jan Tojnar
e474134ea0 meson: 0.62.2 → 0.63.0
https://mesonbuild.com/Release-notes-for-0-63-0.html
https://github.com/mesonbuild/meson/compare/0.62.2...0.63.0
2022-08-12 20:55:15 +02:00
Ryan Burns
a4a300dfff meson: 0.61.2 → 0.62.2
https://mesonbuild.com/Release-notes-for-0-62-0.html
https://github.com/mesonbuild/meson/compare/0.61.2...0.62.0
https://github.com/mesonbuild/meson/compare/0.62.0...0.62.1
https://github.com/mesonbuild/meson/compare/0.62.1...0.62.2
2022-08-12 20:55:15 +02:00
Artturin
596a678b7f meson: pull patch to use more binutils variables
meson did not use these

therefore some packages had to do things
like this

```
    substituteInPlace meson.build --replace \
      "find_program('nm')" \
      "find_program('${stdenv.cc.targetPrefix}nm')"
```
2022-08-01 20:03:47 +03:00
Artturin
6e6292279e meson: add mesonEmulatorHook
fixes building documentation while cross-compiling and other issues
Exec format error: './gdk3-scan'

added some simple documentation
2022-06-11 04:51:04 +03:00
Rick van Schijndel
e91229bf25 meson: apply patch fixing exception during cross-compilation
Fixes a traceback where you get the following error:
- AttributeError: 'NoneType' object has no attribute 'get_command'

This happened when cross-compiling e.g. harfbuzz.
2022-04-19 16:53:35 +02:00
Jan Tojnar
a6fcd7b301 glib: Fix conflicts in Meson patch on Darwin
Now based onto 0.61.2.
2022-03-26 09:50:05 +01:00
Vladimír Čunát
a42ca0678b
Merge branch 'master' into staging-next 2022-03-26 09:20:38 +01:00
Jan Tojnar
0e78d578e6 glib: Fix docs on Darwin
They are failing due to a Meson bug.

Doing it this hacky way to avoid rebuilding the world.
2022-03-26 03:50:26 +01:00
Nick Cao
b5fde728ee
meson: 0.60.3 -> 0.61.2 2022-03-12 22:41:14 +08:00
Nick Cao
3c984f9fe1
meson: do not update ldconfig cache 2022-01-15 11:57:24 +08:00
Las Safin
41d9dfb619 meson: Remove 0.57, use 0.60 everywhere 2022-01-11 12:51:09 +00:00
AndersonTorres
bf547b254f meson: 0.60.2 -> 0.60.3 2022-01-03 23:02:43 -03:00
AndersonTorres
650c249d8f meson: document the failed tests issue
The comment should be self-explaining now.
2021-12-14 16:37:41 -03:00
AndersonTorres
5dc14c358c meson: add myself as maintainer 2021-12-14 16:37:41 -03:00
AndersonTorres
c401c98393 meson 0.60: Fix more-env-vars.patch
Concatenation of lists in Python is done by the `+` operator.
2021-12-14 16:37:40 -03:00
AndersonTorres
fac4c247ca meson: 0.57.1 -> 0.60.2 2021-12-14 16:37:40 -03:00
AndersonTorres
e9c8925d1b meson: copy 0.57 to 0.60
A very ugly decision: in order to register the diff between 0.57 and 0.60
releases of Meson in Nixpkgs, I copied the whole directory before actually write
it by hand.
2021-12-14 16:37:40 -03:00
AndersonTorres
1a53eeda71 meson: put 0.57 in a subdirectory
Meson is a delicate package. It needs some patches to properly work in Nixpkgs
and many packages have it as a dependency, from many small applications to
systemd (yay, mass rebuilds in sight!). Updating it is not a trivial and
harmless task.

Therefore, I took the paranoid way and encapsulate the current version in a
subdir, instead of the regular write-over procedure. This way, at the best we
can just remove the whole dir in the future, and at the worse we just maintain
duplicated code.
2021-12-14 16:37:25 -03:00
Jan Tojnar
3242c2f8ae
meson: 0.56.0 → 0.57.1
- https://mesonbuild.com/Release-notes-for-0-57-0.html
- https://github.com/mesonbuild/meson/releases/tag/0.57.0
- https://github.com/mesonbuild/meson/releases/tag/0.57.1
2021-02-20 15:27:20 +01:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Dylan Baker
1bf598874f meson: install shell completions
meson ships with both bash and zsh completions, the zsh completions are
more complete than the bash ones.
2020-12-23 11:50:38 -08:00
John Ericson
5bafec36ef
Merge pull request #99176 from Ericson2314/meson-remove-extra-cc
meson: Remove propagated native C compiler
2020-11-15 14:18:15 -05:00
Jan Tojnar
f80fb9cb87
meson: 0.55.3 → 0.56.0
https://mesonbuild.com/Release-notes-for-0-56-0.html
https://github.com/mesonbuild/meson/releases/tag/0.56.0
2020-10-30 10:27:51 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Niklas Hambüchen
70a924fa80 meson: Patch out default boost search paths. See #86131.
Avoids impure builds on unsandboxed non-NixOS builds, see:
https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
2020-10-20 21:02:43 +02:00
John Ericson
f60fc7f61f meson: Remove propagated native C compiler
Now that we have a Meson release containting [1], Meson will work fine
without a native compiler, so we don't need this trick anymore.

Fixes #58831

[1]: https://github.com/mesonbuild/meson/pull/6512
2020-09-30 10:31:39 -04:00
Jan Tojnar
87a69dafa3
meson: 0.55.1 → 0.55.3 2020-09-18 20:05:56 +02:00
Jan Tojnar
c6acf50360 meson: 0.55.0 → 0.55.1
https://github.com/mesonbuild/meson/compare/0.55.0...0.55.1

setuptools have been removed from runtime dependencies:
https://github.com/mesonbuild/meson/pull/7461
2020-08-16 19:48:32 +02:00
Anders Kaseorg
dbac38cf0e meson: Add upstream patch to stop failing on skipped tests
https://github.com/mesonbuild/meson/pull/7525

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-08-14 08:23:53 +02:00
Jan Tojnar
e8bfa708c4 meson: Fix rpath clearing
Meson allows projects to set `build_rpath` property, containing paths
that will be added during build but will be removed when installing.

When Meson removes build_rpath from `DT_RUNPATH` entry, it just writes
the shorter ␀-terminated new rpath over the old one to reduce
the risk of potentially breaking the ELF files
(when the linker does string de-duplication or something).
But this can cause much bigger problem for Nix, as it can produce
cut-in-half-by-␀ store path references.

For example, in systemd’s libudev, it was removing three `$ORIGIN`-relative paths from

    $ORIGIN/../libsystemd:$ORIGIN/../basic:$ORIGIN/../shared:…␀

resulting in the following `DT_RUNPATH` entry:

    …␀store/v589pqjhvxrj73g3r0xb41yr84z5pwb7-gcc-9.3.0-lib/lib␀

We previously handled this in `fix-rpath.patch` but the method we prevent
Meson from removing paths added to rpath through `NIX_LDFLAGS` was changed
during 0.55.0 update and I forgot about this second purpose of the patch.

Let’s re-add this clearing code, as it worked without issues for a long time.
2020-08-11 17:48:18 +02:00
Jan Tojnar
d8ac41f863
meson: 0.54.2 → 0.55.0
https://mesonbuild.com/Release-notes-for-0-55-0.html
https://github.com/mesonbuild/meson/releases/tag/0.55.0
https://github.com/mesonbuild/meson/compare/0.54.2...0.55.0
2020-07-12 19:56:33 +02:00
Jan Tojnar
c19222143e
meson: clean up 2020-07-12 19:56:24 +02:00
Frederik Rietdijk
f9af74e75a meson: fix hash after incorrect merge 2020-06-04 17:53:31 +02:00