Skip to content

meson: 0.61.2 -> 0.63.0 #181132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ajs124 wants to merge 4 commits into from
Closed

meson: 0.61.2 -> 0.63.0 #181132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da7c615
meson: 0.61.2 -> 0.63.0
ajs124 Jul 11, 2022
13e52f0
wayland-protocols: 1.25 -> 1.26
ajs124 Jul 11, 2022
eb39320
wayland-protocols: disable fortify hardening, when tests are enabled
ajs124 Jul 11, 2022
7f4b03f
libcamera: disable fortify hardening
ajs124 Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/development/libraries/libcamera/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,13 @@ stdenv.mkDerivation {
"-Dv4l2=true"
"-Dqcam=disabled"
"-Dlc-compliance=disabled" # tries unconditionally to download gtest when enabled
];
];

# Fixes error on a deprecated declaration
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

hardeningDisable = [ "fortify" ];

# Silence fontconfig warnings about missing config
FONTCONFIG_FILE = makeFontsConf { fontDirectories = []; };

Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/libraries/wayland/protocols.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
sha256 = "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5";
hash = "sha256-xVM4TBxor9di+lN6JWnMkHT+dgDaEtNHJ2HneiulbxM=";
};

postPatch = lib.optionalString doCheck ''
Expand All @@ -25,6 +25,8 @@ stdenv.mkDerivation rec {

mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ];

hardeningDisable = lib.optional doCheck "fortify";

meta = {
description = "Wayland protocol extensions";
longDescription = ''
Expand Down
19 changes: 0 additions & 19 deletions pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
View file
Open in desktop

This file was deleted.

18 changes: 2 additions & 16 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ lib
, fetchpatch
, installShellFiles
, ninja
, pkg-config
Expand All @@ -10,20 +9,14 @@

python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "0.61.2";
version = "0.63.0";

src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-AjOn+NlZB5MY9gUrCTnCf2il3oa6YB8lye5oaftfWIk=";
hash = "sha256-O1HUUXRMK8cYOFJOyNls1PjEeT1bjV0NCpyKT3yUzW8=";
};

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

# Meson is currently inspecting fewer variables than autoconf does, which
# makes it harder for us to use setup hooks, etc. Taken from
# https://github.com/mesonbuild/meson/pull/6827
Expand Down Expand Up @@ -58,13 +51,6 @@ python3.pkgs.buildPythonApplication rec {
# unsandboxed non-NixOS builds, see:
# https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
./boost-Do-not-add-system-paths-on-nix.patch

# https://github.com/mesonbuild/meson/pull/9841
# cross-compilation fix
(fetchpatch {
url = "https://github.com/mesonbuild/meson/commit/266e8acb5807b38a550cb5145cea0e19545a21d7.patch";
sha256 = "sha256-1GdKsm2xvq2GxTNeTyBH5O73hxboL0YI+w2BCoUeWXM=";
})
] ++ lib.optionals withDarwinFrameworksGtkDocPatch [
# Fix building gtkdoc for GLib
# https://github.com/mesonbuild/meson/pull/10186
Expand Down