Test building Pantheon with meson 0.61

pantheon-test-meson-0.61.patch

From a332decaa3952dcfb55a20a950d1ebf33b449a46 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 13 Jan 2022 14:13:07 +0800
Subject: [PATCH] pantheon: test meson 0.61

---
 pkgs/desktops/pantheon/apps/appcenter/default.nix         | 4 ++--
 .../pantheon/apps/elementary-calculator/default.nix       | 4 ++--
 .../pantheon/apps/elementary-calendar/default.nix         | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-code/default.nix   | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-dock/default.nix   | 4 ++--
 .../pantheon/apps/elementary-feedback/default.nix         | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-files/default.nix  | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-mail/default.nix   | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-music/default.nix  | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 4 ++--
 .../pantheon/apps/elementary-screenshot/default.nix       | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-tasks/default.nix  | 4 ++--
 .../pantheon/apps/elementary-terminal/default.nix         | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 4 ++--
 pkgs/desktops/pantheon/apps/sideload/default.nix          | 4 ++--
 .../pantheon/apps/switchboard-plugs/a11y/default.nix      | 4 ++--
 .../pantheon/apps/switchboard-plugs/about/default.nix     | 4 ++--
 .../apps/switchboard-plugs/applications/default.nix       | 4 ++--
 .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 4 ++--
 .../pantheon/apps/switchboard-plugs/datetime/default.nix  | 4 ++--
 .../pantheon/apps/switchboard-plugs/display/default.nix   | 4 ++--
 .../pantheon/apps/switchboard-plugs/keyboard/default.nix  | 4 ++--
 .../apps/switchboard-plugs/mouse-touchpad/default.nix     | 4 ++--
 .../pantheon/apps/switchboard-plugs/network/default.nix   | 4 ++--
 .../apps/switchboard-plugs/notifications/default.nix      | 4 ++--
 .../apps/switchboard-plugs/onlineaccounts/default.nix     | 4 ++--
 .../apps/switchboard-plugs/pantheon-shell/default.nix     | 4 ++--
 .../pantheon/apps/switchboard-plugs/power/default.nix     | 4 ++--
 .../pantheon/apps/switchboard-plugs/printers/default.nix  | 4 ++--
 .../apps/switchboard-plugs/security-privacy/default.nix   | 4 ++--
 .../pantheon/apps/switchboard-plugs/sharing/default.nix   | 4 ++--
 .../pantheon/apps/switchboard-plugs/sound/default.nix     | 4 ++--
 .../pantheon/apps/switchboard-plugs/wacom/default.nix     | 4 ++--
 pkgs/desktops/pantheon/apps/switchboard/default.nix       | 4 ++--
 .../pantheon/artwork/elementary-gtk-theme/default.nix     | 4 ++--
 .../pantheon/artwork/elementary-icon-theme/default.nix    | 4 ++--
 .../pantheon/artwork/elementary-sound-theme/default.nix   | 4 ++--
 .../pantheon/artwork/elementary-wallpapers/default.nix    | 4 ++--
 .../desktop/elementary-default-settings/default.nix       | 4 ++--
 .../pantheon/desktop/elementary-greeter/default.nix       | 4 ++--
 .../pantheon/desktop/elementary-onboarding/default.nix    | 4 ++--
 .../pantheon/desktop/elementary-print-shim/default.nix    | 4 ++--
 .../desktop/elementary-session-settings/default.nix       | 4 ++--
 .../desktop/elementary-shortcut-overlay/default.nix       | 4 ++--
 pkgs/desktops/pantheon/desktop/gala/default.nix           | 4 ++--
 .../desktop/wingpanel-indicators/a11y/default.nix         | 4 ++--
 .../wingpanel-indicators/applications-menu/default.nix    | 4 ++--
 .../desktop/wingpanel-indicators/bluetooth/default.nix    | 4 ++--
 .../desktop/wingpanel-indicators/datetime/default.nix     | 4 ++--
 .../desktop/wingpanel-indicators/keyboard/default.nix     | 4 ++--
 .../desktop/wingpanel-indicators/network/default.nix      | 4 ++--
 .../desktop/wingpanel-indicators/nightlight/default.nix   | 4 ++--
 .../wingpanel-indicators/notifications/default.nix        | 4 ++--
 .../desktop/wingpanel-indicators/power/default.nix        | 4 ++--
 .../desktop/wingpanel-indicators/session/default.nix      | 4 ++--
 .../desktop/wingpanel-indicators/sound/default.nix        | 4 ++--
 pkgs/desktops/pantheon/desktop/wingpanel/default.nix      | 4 ++--
 pkgs/desktops/pantheon/granite/default.nix                | 4 ++--
 pkgs/desktops/pantheon/services/contractor/default.nix    | 4 ++--
 .../services/elementary-capnet-assist/default.nix         | 4 ++--
 .../services/elementary-notifications/default.nix         | 4 ++--
 .../services/elementary-settings-daemon/default.nix       | 4 ++--
 .../pantheon/services/pantheon-agent-geoclue2/default.nix | 4 ++--
 .../pantheon/services/pantheon-agent-polkit/default.nix   | 4 ++--
 .../services/xdg-desktop-portal-pantheon/default.nix      | 4 ++--
 .../pantheon/third-party/pantheon-tweaks/default.nix      | 4 ++--
 .../third-party/wingpanel-indicator-ayatana/default.nix   | 4 ++--
 .../tools/build-managers/meson/0.60/default.nix           | 4 ++--
 .../tools/build-managers/meson/0.60/fix-rpath.patch       | 8 ++++----
 70 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index bdc2fbca591..7267062134a 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -18,7 +18,7 @@
 , libhandy
 , libsoup
 , libxml2
-, meson
+, meson_0_60
 , ninja
 , packagekit
 , pkg-config
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     dbus # for pkg-config
     desktop-file-utils
     gettext
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 115622e8143..67f30917a84 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , desktop-file-utils
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     appstream
     desktop-file-utils
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index 019e2cf5a24..46674453530 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , desktop-file-utils
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 7135795914d..afb4e58a98e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , desktop-file-utils
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     gettext
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 5007e297267..f8142f9535a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , python3
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     polkit # needed for ITS rules
diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
index 5aa61062a8f..89c76eec910 100644
--- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
@@ -21,7 +21,7 @@
 , gnome-menus
 , libgee
 , wrapGAppsHook
-, meson
+, meson_0_60
 , ninja
 , granite
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     libxml2 # xmllint
     pkg-config
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 8a9256f2a61..8ca9cdfa664 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , python3
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 4b829321c37..30ba4f6d06a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , gettext
 , vala
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     gettext
     glib-networking
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
index 58be49ab4be..6e9d87fc0aa 100644
--- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , python3
 , vala
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     appstream
     desktop-file-utils
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index cceeeabf15f..53235ac1ab0 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , desktop-file-utils
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index ca7b6fd3a7d..77749888539 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
index 9e65a562875..d9e53980ec7 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , python3
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
index 7ef0efaa49f..586239b4067 100644
--- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix
@@ -4,7 +4,7 @@
 , nix-update-script
 , appstream
 , desktop-file-utils
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , python3
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     appstream
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index f3402299ff7..a9e5c24d868 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , python3
 , vala
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     appstream
     desktop-file-utils
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index f7286c9108a..c252aeae11e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , python3
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index a065966ba1e..395c44cc9f2 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -12,7 +12,7 @@
 , gtk3
 , libgee
 , libhandy
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , python3
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     desktop-file-utils
     gettext
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index bcb7c39d17b..7bce7d22650 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , fetchpatch
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index d48704736b1..a32bb552e99 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , substituteAll
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index d24b7550260..9d18ca62ae2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 764845c0202..2fc27afc73b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fetchpatch
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index 09717a584ce..21f9fb71187 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fetchpatch
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , substituteAll
 , pkg-config
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index c25188add45..13b164dc811 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 01a3da26b1d..099fabe09c4 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , substituteAll
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index a765eca6de2..8d686b464c5 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , substituteAll
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index b88f3f72d03..720e65c928c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , substituteAll
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index fd5dfa32810..4885935eb02 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , fetchpatch
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 46703b349e6..a0c1623b95b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index 6fc961e4b5f..d99e867c270 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 16ed92b45d2..0355f7dfd4c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index dbca28038ab..1cd74d077f2 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , fetchpatch
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 550562f19b1..34518276d09 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , python3
 , ninja
 , pkg-config
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index f41cfa2f745..2efecee3f26 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , fetchpatch
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index 8a23f09838e..19d07580e87 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
index e31768c764d..144db71b7e9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fetchpatch
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 50a3317d6e0..1cc95177c36 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , python3
 , ninja
 , vala
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index b76a874490e..aa576ef4b4c 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , gettext
 , sassc
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     sassc
   ];
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 450275d1050..c346bee2be9 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , python3
 , ninja
 , hicolor-icon-theme
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     gtk3
     librsvg
-    meson
+    meson_0_60
     ninja
     python3
     xorg.xcursorgen
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index 6bad05693fe..31aa48f9f40 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
   ];
diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index debf7f0201a..4b12064cb60 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , gettext
-, meson
+, meson_0_60
 , ninja
 , python3
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     python3
   ];
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index a96bba4ab11..a7b8fc03ea1 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , nixos-artwork
 , glib
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     accountsservice
     dbus
     glib # polkit requires
-    meson
+    meson_0_60
     ninja
     pkg-config
     polkit
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 72df609c5a4..9a3d25a84d6 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -7,7 +7,7 @@
 , substituteAll
 , elementary-greeter
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , desktop-file-utils
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index e7a3d10b4fd..aca7407e125 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -5,7 +5,7 @@
 , nix-update-script
 , substituteAll
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , python3
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index 119d5be2138..a584de7d27e 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 2c0d2ae100c..0423b9a648a 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -14,7 +14,7 @@
 , gnome-settings-daemon
 , runtimeShell
 , writeText
-, meson
+, meson_0_60
 , ninja
 }:
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
   ];
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index 1d4a1cb7414..7ffafcd8858 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , libxml2
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     desktop-file-utils
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 5a5af9ca5b9..185f89f3dce 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , python3
 , ninja
 , vala
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     desktop-file-utils
     gettext
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
index 7ffc2cebab7..30863422ec1 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fetchpatch
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , python3
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index badfec690eb..08b1bab4502 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , substituteAll
-, meson
+, meson_0_60
 , ninja
 , python3
 , pkg-config
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 56d59ed4614..e1901b4bfe4 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , python3
 , ninja
 , vala
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     glib # for glib-compile-schemas
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 1164e0592bf..cac382e2fa6 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -4,7 +4,7 @@
 , nix-update-script
 , substituteAll
 , pkg-config
-, meson
+, meson_0_60
 , python3
 , ninja
 , vala
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 4ce8fb0434f..36cd0740f7d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , substituteAll
 , vala
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     libxml2
     pkg-config
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index fdb6481f7e7..5b007a3c21d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -4,7 +4,7 @@
 , nix-update-script
 , substituteAll
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , gtk3
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index ecaa05bc356..a1056d2afc1 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , gtk3
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index ceabac94a23..0a0545f8297 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , gtk3
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index 38a8fb23701..9742cc661a7 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -5,7 +5,7 @@
 , nix-update-script
 , gnome
 , pkg-config
-, meson
+, meson_0_60
 , python3
 , ninja
 , vala
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index 510558f3cb6..bf0781096fe 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -4,7 +4,7 @@
 , nix-update-script
 , fetchpatch
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , gtk3
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index 16e04bedcb9..69b316daaba 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , python3
 , ninja
 , vala
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     libxml2
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 0cd7a13c3e1..852eaefe82c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -4,7 +4,7 @@
 , nix-update-script
 , wrapGAppsHook
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , gala
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gettext
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix
index ec2255bbbc1..d1a887d6db7 100644
--- a/pkgs/desktops/pantheon/granite/default.nix
+++ b/pkgs/desktops/pantheon/granite/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , python3
-, meson
+, meson_0_60
 , ninja
 , vala
 , pkg-config
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     gettext
     gobject-introspection
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index a6c0cb8a3c5..99f36b6cbe5 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , python3
 , ninja
 , pkg-config
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     dbus
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index cde957a20b1..50a0b97fc04 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -4,7 +4,7 @@
 , fetchpatch
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , python3
 , ninja
 , vala
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
index 2ea13c9cb59..62352cae784 100644
--- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     glib # for glib-compile-schemas
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 69a0c2a7bb1..5214187fc39 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , python3
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     desktop-file-utils
     gobject-introspection
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index c135ea4e18e..67f57b49dec 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , glib
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     desktop-file-utils
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 3644d9665df..07ed8e580e0 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , nix-update-script
 , pkg-config
-, meson
+, meson_0_60
 , ninja
 , vala
 , gtk3
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
index 3ceff2095d2..24be732f98c 100644
--- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
+++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix
index af6bf54fd71..ef820c7a109 100644
--- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix
+++ b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , python3
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
index 6e3fbf5777b..6bae71a1f8a 100644
--- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
+++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , substituteAll
-, meson
+, meson_0_60
 , ninja
 , pkg-config
 , vala
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    meson
+    meson_0_60
     ninja
     pkg-config
     vala
diff --git a/pkgs/development/tools/build-managers/meson/0.60/default.nix b/pkgs/development/tools/build-managers/meson/0.60/default.nix
index a5efccfac9c..1062cb62484 100644
--- a/pkgs/development/tools/build-managers/meson/0.60/default.nix
+++ b/pkgs/development/tools/build-managers/meson/0.60/default.nix
@@ -9,11 +9,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "0.60.3";
+  version = "0.61.0";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    hash = "sha256-h8pfqTWKAYZFKTkr1k4CcVjrlK/KfHdmsYZu8n7MuY4=";
+    hash = "sha256-6p8zJGsfI/AukKUOdeD0HlJvbavwwk8+AOJ6P1q9w1w=";
   };
 
   patches = [
diff --git a/pkgs/development/tools/build-managers/meson/0.60/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/0.60/fix-rpath.patch
index d34b6c4c434..29bec7903ca 100644
--- a/pkgs/development/tools/build-managers/meson/0.60/fix-rpath.patch
+++ b/pkgs/development/tools/build-managers/meson/0.60/fix-rpath.patch
@@ -1,9 +1,9 @@
 --- a/mesonbuild/backend/backends.py
 +++ b/mesonbuild/backend/backends.py
-@@ -456,6 +456,21 @@ class Backend:
-                 args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang))
-             except Exception:
-                 pass
+@@ -723,6 +723,21 @@
+     @staticmethod
+     def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]:
+         dirs: T.Set[str] = set()
 +
 +        nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split()
 +        next_is_path = False
-- 
2.34.1