forked from mirrors/nixpkgs
099c13da1b
* substitute(): --subst-var was silently coercing to "" if the variable does not exist. * libffi: simplify using `checkInputs` * pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix * utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 * busybox: 1.29.0 -> 1.29.1 * bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html * curl: 7.60.0 -> 7.61.0 * gvfs: make tests run, but disable * ilmbase: disable tests on i686. Spooky! * mdds: fix tests * git: disable checks as tests are run in installcheck * ruby: disable tests * libcommuni: disable checks as tests are run in installcheck * librdf: make tests run, but disable * neon, neon_0_29: make tests run, but disable * pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. * mesa: more include fixes mostly from void-linux (thanks!) * npth: 1.5 -> 1.6 minor bump * boost167: Add lockfree next_prior patch * stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. * Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commitf8db20fb3a. Patching should no longer be needed with 3.6.1. * binutils-wrapper: Try to avoid adding unnecessary -L flags (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar <domen@dev.si> * libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. * "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook * python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. * parity-ui: fix after merge * python.pkgs.pytest-flake8: disable test, fix build * Revert "meson: 0.46.1 -> 0.47.0" With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit305ac4dade. (cherry picked from commit273d68eff8) Signed-off-by: Domen Kožar <domen@dev.si>
82 lines
2.7 KiB
Nix
82 lines
2.7 KiB
Nix
{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let
|
|
targetPrefix = lib.optionalString stdenv.isCross
|
|
(targetPlatform.config + "-");
|
|
in python3Packages.buildPythonApplication rec {
|
|
version = "0.46.1";
|
|
pname = "meson";
|
|
|
|
src = python3Packages.fetchPypi {
|
|
inherit pname version;
|
|
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
|
|
};
|
|
|
|
postFixup = ''
|
|
pushd $out/bin
|
|
# undo shell wrapper as meson tools are called with python
|
|
for i in *; do
|
|
mv ".$i-wrapped" "$i"
|
|
done
|
|
popd
|
|
'';
|
|
|
|
patches = [
|
|
# Upstream insists on not allowing bindir and other dir options
|
|
# outside of prefix for some reason:
|
|
# https://github.com/mesonbuild/meson/issues/2561
|
|
# We remove the check so multiple outputs can work sanely.
|
|
./allow-dirs-outside-of-prefix.patch
|
|
|
|
# Unlike libtool, vanilla Meson does not pass any information
|
|
# about the path library will be installed to to g-ir-scanner,
|
|
# breaking the GIR when path other than ${!outputLib}/lib is used.
|
|
# We patch Meson to add a --fallback-library-path argument with
|
|
# library install_dir to g-ir-scanner.
|
|
./gir-fallback-path.patch
|
|
|
|
# In common distributions, RPATH is only needed for internal libraries so
|
|
# meson removes everything else. With Nix, the locations of libraries
|
|
# are not as predictable, therefore we need to keep them in the RPATH.
|
|
# At the moment we are keeping the paths starting with /nix/store.
|
|
# https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
|
|
(substituteAll {
|
|
src = ./fix-rpath.patch;
|
|
inherit (builtins) storeDir;
|
|
})
|
|
];
|
|
|
|
setupHook = ./setup-hook.sh;
|
|
|
|
crossFile = writeTextDir "cross-file.conf" ''
|
|
[binaries]
|
|
c = '${targetPrefix}cc'
|
|
cpp = '${targetPrefix}c++'
|
|
ar = '${targetPrefix}ar'
|
|
strip = '${targetPrefix}strip'
|
|
pkgconfig = 'pkg-config'
|
|
|
|
[properties]
|
|
needs_exe_wrapper = true
|
|
|
|
[host_machine]
|
|
system = '${targetPlatform.parsed.kernel.name}'
|
|
cpu_family = '${targetPlatform.parsed.cpu.family}'
|
|
cpu = '${targetPlatform.parsed.cpu.name}'
|
|
endian = ${if targetPlatform.isLittleEndian then "'little'" else "'big'"}
|
|
'';
|
|
|
|
# 0.45 update enabled tests but they are failing
|
|
doCheck = false;
|
|
# checkInputs = [ ninja pkgconfig ];
|
|
# checkPhase = "python ./run_project_tests.py";
|
|
|
|
inherit (stdenv) cc isCross;
|
|
|
|
meta = with lib; {
|
|
homepage = http://mesonbuild.com;
|
|
description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
|
|
license = licenses.asl20;
|
|
maintainers = with maintainers; [ mbe rasendubi ];
|
|
platforms = platforms.all;
|
|
};
|
|
}
|