Skip to content

Meson bump #153082

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
AndersonTorres wants to merge 8 commits into from
Closed

Meson bump #153082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e7a4e7d
meson: change default to 0.60
AndersonTorres Jan 1, 2022
9f621a1
systemd: use old Meson
AndersonTorres Jan 1, 2022
02e2f27
wlroots 0.15: refactor
AndersonTorres Jan 2, 2022
f89d5dc
wlroots 0.15: change meta.platforms
AndersonTorres Jan 2, 2022
cb7da00
wlroots 0.15: change meson attribute
AndersonTorres Jan 2, 2022
2bd4110
metadata-cleaner: change meson attribute
AndersonTorres Jan 1, 2022
f8e08bf
libadwaita: change meson attribute
AndersonTorres Jan 1, 2022
70ebb00
GTK 4.x: change meson attribute
AndersonTorres Jan 2, 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: 2 additions & 2 deletions pkgs/applications/misc/metadata-cleaner/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
, itstool
, libadwaita
, librsvg
, meson_0_60
, meson
, ninja
, pkg-config
, poppler_gi
Expand All @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {
glib
gtk4
itstool
meson_0_60
meson
ninja
pkg-config
wrapGAppsHook
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gtk/4.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, gettext
, graphene
, gi-docgen
, meson_0_60
, meson
, ninja
, python3
, makeWrapper
Expand Down Expand Up @@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
gettext
gobject-introspection
makeWrapper
meson_0_60
meson
ninja
pkg-config
python3
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libadwaita/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, gi-docgen
, gtk-doc
, libxml2
, meson_0_60
, meson
, ninja
, pkg-config
, sassc
Expand Down Expand Up @@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
gi-docgen
gtk-doc
libxml2 # for xmllint
meson_0_60
meson
ninja
pkg-config
sassc
Expand Down
69 changes: 53 additions & 16 deletions pkgs/development/libraries/wlroots/0.15.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
{ lib, stdenv, fetchFromGitLab, meson_0_60, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang
{ lib
, stdenv
, fetchFromGitLab
, ffmpeg
, glslang
, libGL
, libX11
, libcap
, libinput
, libpng
, libxkbcommon
, mesa
, meson
, ninja
, pixman
, pkg-config
, seatd
, vulkan-loader
, wayland
, wayland-protocols
, wayland-scanner
, xcbutilerrors
, xcbutilimage
, xcbutilrenderutil
, xcbutilwm
Comment on lines 1 to 25
Copy link
Member

@primeos primeos Jan 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker but I hate those refactorings in unrelated commits (it's a bad commit practice). We should either reformat all of Nixpkgs at once or packages individually. A commit like 3d74e57 ("wlroots 0.15: change meson attribute - Meson 0.60 is the default now") shouldn't contain such unrelated changes.

Copy link
Member Author

@AndersonTorres AndersonTorres Jan 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understandable.
I prefer to do such code refactorings among other things because they did not change the semantics of the code.
Anyway I have splitted the commits in order to reflect this.


, enableXWayland ? true, xwayland ? null
}:
Expand All @@ -23,19 +44,35 @@ stdenv.mkDerivation rec {

depsBuildBuild = [ pkg-config ];

nativeBuildInputs = [ meson_0_60 ninja pkg-config wayland-scanner ];
nativeBuildInputs = [
meson
ninja
pkg-config
wayland-scanner
];

buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
libpng ffmpeg xcbutilrenderutil seatd vulkan-loader glslang
ffmpeg
libGL
libX11
libcap
libinput
libpng
libxkbcommon
mesa
pixman
seatd
vulkan-loader glslang
wayland
wayland-protocols
xcbutilerrors
xcbutilimage
xcbutilrenderutil
xcbutilwm
]
++ lib.optional enableXWayland xwayland
;
++ lib.optional enableXWayland xwayland;

mesonFlags =
lib.optional (!enableXWayland) "-Dxwayland=disabled"
;
mesonFlags = lib.optional (!enableXWayland) "-Dxwayland=disabled";

postFixup = ''
# Install ALL example programs to $examples:
Expand All @@ -50,15 +87,15 @@ stdenv.mkDerivation rec {
'';

meta = with lib; {
inherit (src.meta) homepage;
description = "A modular Wayland compositor library";
longDescription = ''
Pluggable, composable, unopinionated modules for building a Wayland
compositor; or about 50,000 lines of code you were going to write anyway.
'';
inherit (src.meta) homepage;
changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
license = licenses.mit;
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ primeos synthetica ];
inherit (wayland.meta) platforms;
};
}
6 changes: 4 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3406,8 +3406,8 @@ with pkgs;
merriweather-sans = callPackage ../data/fonts/merriweather-sans { };

# TODO: call a sprintable to deprecate Meson 0.57 as soon as possible
meson = callPackage ../development/tools/build-managers/meson/0.57 { };
meson_0_60 = callPackage ../development/tools/build-managers/meson/0.60 { };
meson_0_57 = callPackage ../development/tools/build-managers/meson/0.57 { };
meson = callPackage ../development/tools/build-managers/meson/0.60 { };

meson-tools = callPackage ../misc/meson-tools { };

Expand Down Expand Up @@ -22943,6 +22943,8 @@ with pkgs;
sysstat = callPackage ../os-specific/linux/sysstat { };

systemd = callPackage ../os-specific/linux/systemd {
# TODO: get rid of this old meson
meson = meson_0_57;
# break some cyclic dependencies
util-linux = util-linuxMinimal;
# provide a super minimal gnupg used for systemd-machined
Expand Down