cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #200240 from raboof/meson-0.63.1-to-0.64.0

Browse source
This commit is contained in:
Sandro 2022-12-02 20:20:04 +01:00 committed by GitHub
commit a5a833468f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/tools/build-managers/meson/default.nix
View file

@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "meson"; pname = "meson";
version = "0.63.1"; version = "0.64.1";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "Bv4TKXIT1v8BIcXVqrJaVu+Tj/7FdBTtYIb9onLLZek="; sha256 = "sha256-Oo4DDCM094IIX4FicGLMbUpnce3zHgVf/jdPnmsImrk=";
}; };
patches = [ patches = [
@ -52,15 +52,6 @@ python3.pkgs.buildPythonApplication rec {
# https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
./boost-Do-not-add-system-paths-on-nix.patch ./boost-Do-not-add-system-paths-on-nix.patch
# Prevent Meson from passing -O0 in buildtype=plain.
# Nixpkgs enables fortifications which do not work without optimizations.
# https://github.com/mesonbuild/meson/pull/10593
(fetchpatch {
url = "https://github.com/mesonbuild/meson/commit/f9bfeb2add70973113ab4a98454a5c5d7e3a26ae.patch";
revert = true;
sha256 = "VKXUwdS+zMp1y+5GrV2inESUpUUp+OL3aI4wOXHxOeo=";
})
# Fix passing multiple --define-variable arguments to pkg-config. # Fix passing multiple --define-variable arguments to pkg-config.
# https://github.com/mesonbuild/meson/pull/10670 # https://github.com/mesonbuild/meson/pull/10670
(fetchpatch { (fetchpatch {