diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index f113eed155fcc..01c8ade58c4b9 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -9,7 +9,7 @@ , itstool , libadwaita , librsvg -, meson_0_60 +, meson , ninja , pkg-config , poppler_gi @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { glib gtk4 itstool - meson_0_60 + meson ninja pkg-config wrapGAppsHook diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 99e3b9e969a96..4dbf33739939c 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -6,7 +6,7 @@ , gettext , graphene , gi-docgen -, meson_0_60 +, meson , ninja , python3 , makeWrapper @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { gettext gobject-introspection makeWrapper - meson_0_60 + meson ninja pkg-config python3 diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 4c11479abea4f..f67c5721d9471 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -5,7 +5,7 @@ , gi-docgen , gtk-doc , libxml2 -, meson_0_60 +, meson , ninja , pkg-config , sassc @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { gi-docgen gtk-doc libxml2 # for xmllint - meson_0_60 + meson ninja pkg-config sassc diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix index 93ecf0bd3ab3b..5a93ada30a7bd 100644 --- a/pkgs/development/libraries/wlroots/0.15.nix +++ b/pkgs/development/libraries/wlroots/0.15.nix @@ -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 , enableXWayland ? true, xwayland ? null }: @@ -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: @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 048e3f95e384e..7d3a12742b982 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; @@ -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