From e2686f5ab3881a366e6894293d1ee4aecfcb2d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 17:36:47 +0100 Subject: [PATCH 01/15] mpc_cli: fix build with meson 0.60 Adds upstream patch from https://github.com/MusicPlayerDaemon/mpc/pull/76 to make the dependency on rsync optional. --- pkgs/applications/audio/mpc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 0511367db3b8..82f349216fe4 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw="; }; + patches = [ + # fix the build with meson 0.60 (https://github.com/MusicPlayerDaemon/mpc/pull/76) + (fetchpatch { + url = "https://github.com/MusicPlayerDaemon/mpc/commit/b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e.patch"; + sha256 = "sha256-fjjSlCKxgkz7Em08CaK7+JAzl8YTzLcpGGMz2HJlsVw="; + }) + ]; + buildInputs = [ libmpdclient ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; nativeBuildInputs = [ meson ninja pkg-config sphinx ]; From b5c610bac8f4128d3574def467362740373d3d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 17:49:18 +0100 Subject: [PATCH 02/15] arcan.xarcan: fix build with meson 0.60 Adds upstream patch from https://github.com/letoram/xarcan/commit/b67e514dbb59bffc23b75d47ca7f24e96c4aeb05 to remove the warnings (which are now errors) --- pkgs/desktops/arcan/xarcan/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/desktops/arcan/xarcan/default.nix index 6245471a7efd..d72bf4ad5bb3 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/desktops/arcan/xarcan/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , arcan , audit , dbus @@ -46,6 +47,14 @@ stdenv.mkDerivation rec { hash = "sha256-UTIVDKnYD/q0K6G7NJUKh1tHcqnsuiJ/cQxWuPMJ2G4="; }; + patches = [ + # fix build with meson 0.60 + (fetchpatch { + url = "https://github.com/letoram/xarcan/commit/b67e514dbb59bffc23b75d47ca7f24e96c4aeb05.patch"; + sha256 = "sha256-tSQmNy1Id6nDIN+03dc1+rEEF8fMq0yJBiscNM60xic="; + }) + ]; + nativeBuildInputs = [ meson ninja From 3026e3dfd416bf479305adb38d1d606378024d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 17:55:16 +0100 Subject: [PATCH 03/15] gtg: fix build with meson 0.60 Adds upstream patch from https://github.com/getting-things-gnome/gtg/pull/729 to fix the error about unknown keyword arguments --- pkgs/applications/office/gtg/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 4b9237d23ce7..6d536ea60a3d 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , meson , python3Packages , ninja @@ -25,6 +26,13 @@ python3Packages.buildPythonApplication rec { sha256 = "0b2slm7kjq6q8c7v4m7aqc8m1ynjxn3bl7445srpv1xc0dilq403"; }; + patches = [ + # fix build with meson 0.60 (https://github.com/getting-things-gnome/gtg/pull/729) + (fetchpatch { + url = "https://github.com/getting-things-gnome/gtg/commit/1809d10663ae3d8f69c04138b66f9b4e66ee14f6.patch"; + sha256 = "sha256-bYr5PAsuvcSqTf0vaJj2APtuBrwHdhXJxtXoAb7CfGk="; + }) + ]; nativeBuildInputs = [ meson From 49c85141aaa5186424d59dac4634b7401d0533e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 17:57:30 +0100 Subject: [PATCH 04/15] hexchat: rename with-text option to text-frontend Fixes the build with meson 0.60. The option was renamed in https://github.com/hexchat/hexchat/commit/cbb0927a7a9113d3b6b772e7b0566752dd54e6dd --- pkgs/applications/networking/irc/hexchat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 504481479ed2..fbe9971f1d7d 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { done ''; - mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; + mesonFlags = [ "-Dwith-lua=lua" "-Dtext-frontend=true" ]; postInstall = '' wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH" From 49d7624b770d4bcd03bb66b8e134dfdab5b6e203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 18:13:19 +0100 Subject: [PATCH 05/15] intel-gpu-tools: fix build with meson 0.60 Adds upstream patch from https://github.com/freedesktop/xorg-intel-gpu-tools/commit/963917a3565466832a3b2fc22e9285d34a0bf944 --- pkgs/development/tools/misc/intel-gpu-tools/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index eca59819ba09..40cf1e14e94d 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , libdrm , libpciaccess @@ -45,6 +46,14 @@ stdenv.mkDerivation rec { sha256 = "1dwvxh1yplsh1a7h3gpp40g91v12cfxy6yy99s1v9yr2kwxikm1n"; }; + patches = [ + # fix build with meson 0.60 + (fetchpatch { + url = "https://github.com/freedesktop/xorg-intel-gpu-tools/commit/963917a3565466832a3b2fc22e9285d34a0bf944.patch"; + sha256 = "sha256-goO2N7aK2dJYMhFGS1DlvjEYMSijN6stV6Q5z/RP8Ko="; + }) + ]; + nativeBuildInputs = [ pkg-config utilmacros meson ninja flex bison gtk-doc docutils docbook_xsl ]; buildInputs = [ libdrm From 4068bcbf353d3eded339349dfe25abbdf0d58930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 18:16:52 +0100 Subject: [PATCH 06/15] iptsd: rename systemd build option to service_manager=systemd Fixes build with meson 0.60 --- pkgs/applications/misc/iptsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index 297ea6dc6a29..7347c4b7849e 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { --replace "install_dir: rulesdir" "install_dir: datadir" \ ''; mesonFlags = [ - "-Dsystemd=true" + "-Dservice_manager=systemd" "-Dsample_config=false" "-Ddebug_tool=false" ]; From 9ab8b1400c5ac6cb2d0ed0bc7787cdecc86a6903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 18:31:54 +0100 Subject: [PATCH 07/15] libfprint-tod: fix build with meson 0.60 libfprint 1.90.7 doesn't support the udev_rules_dir build option --- pkgs/development/libraries/libfprint-tod/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libfprint-tod/default.nix b/pkgs/development/libraries/libfprint-tod/default.nix index 8d7df57896d4..bffafc5e44f4 100644 --- a/pkgs/development/libraries/libfprint-tod/default.nix +++ b/pkgs/development/libraries/libfprint-tod/default.nix @@ -19,7 +19,9 @@ in { sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j"; }; - mesonFlags = mesonFlags ++ [ + mesonFlags = [ + # Include virtual drivers for fprintd tests + "-Ddrivers=all" "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" ]; From 7d97b7dcf545650d9e34073905dcdb5d4326f439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 18:48:14 +0100 Subject: [PATCH 08/15] libhttpseverywhere: fix build with meson 0.60 Adds patch from https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/merge_requests/1 --- pkgs/development/libraries/libhttpseverywhere/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 975ad2258131..80bc73e9a043 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -15,12 +15,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; buildInputs = [ glib libgee json-glib libsoup libarchive ]; - # Fixes build with vala >=0.42 patches = [ + # Fixes build with vala >=0.42 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; }) + # fix build with meson 0.60 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/commit/4c38b2ca25802c464f3204a62815201d8cf549fd.patch"; + sha256 = "sha256-1+fmR0bpvJ9ISN2Hr+BTIQz+Bf6VfY1RdVZ/OohUlWU="; + }) ]; mesonFlags = [ "-Denable_valadoc=true" ]; From 5276d5f62bb18c463d724447e9ad685b5cf85807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 18:52:11 +0100 Subject: [PATCH 09/15] parlatype: remove libreoffice build option Fixes build with meson 0.60. The libreoffice extension was moved to its own repository in https://github.com/gkarsay/parlatype/commit/14386d24e50276fb91157301f3b4ab86214288ad so there's no need to disable it. --- pkgs/applications/audio/parlatype/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 7b448cc69af7..c1bb1102bf1b 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation rec { hicolor-icon-theme ]; - mesonFlags = [ "-Dlibreoffice=false" ]; - postPatch = '' chmod +x data/meson_post_install.py patchShebangs data/meson_post_install.py From 915e4a0fd07484333ef27b832ae85eee7b92da38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 18:58:40 +0100 Subject: [PATCH 10/15] retro-gtk: fix build with meson 0.60 Adds upstream patch from https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/167 --- pkgs/development/libraries/retro-gtk/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index e1385f7a3ef0..113143311edf 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , cmake , meson , ninja @@ -27,6 +28,11 @@ stdenv.mkDerivation rec { patches = [ # https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/150 ./gio-unix.patch + # fix build with meson 0.60 (https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/167) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/retro-gtk/-/commit/8016c10e7216394bc66281f2d9be740140b6fad6.patch"; + sha256 = "sha256-HcQnqadK5sJM5mMqi4KERkJM3H+MUl8AJAorpFDsJ68="; + }) ]; nativeBuildInputs = [ From d251bc57bc989e1728391ad1e76b6ba8647194ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 19:05:45 +0100 Subject: [PATCH 11/15] scrcpy: remove unknown override_server_path option Fixes the build with meson 0.60. The option was removed in https://github.com/Genymobile/scrcpy/commit/eb34098add981aebd0c9aaed89ea9fa04d9ce798 --- pkgs/misc/scrcpy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 871e5bff6c94..594561593e5a 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { echo -n > server/meson.build ''; - mesonFlags = [ "-Doverride_server_path=${prebuilt_server}" ]; postInstall = '' mkdir -p "$out/share/scrcpy" ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server" From c5d52173c2e46487f23fc695883f2f812a08c5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 19:24:21 +0100 Subject: [PATCH 12/15] yabridge: fix meson options Fixes the build with meson 0.60. Options were renamed to lower case in https://github.com/marzer/tomlplusplus/commit/1381240e10bca82064f80cb9f8cd3a4a70671565 and build_tests and build_examples are now disabled when tomlplusplus is used as a subproject. --- pkgs/tools/audio/yabridge/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index c468a845a1a6..688906e684d9 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -105,11 +105,7 @@ in multiStdenv.mkDerivation rec { "-Dwith-bitbridge=true" # Requires CMake and is unnecessary - "-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled" - - # tomlplusplus examples and tests don't build with winegcc - "-Dtomlplusplus:BUILD_EXAMPLES=disabled" - "-Dtomlplusplus:BUILD_TESTS=disabled" + "-Dtomlplusplus:generate_cmake_config=false" ]; installPhase = '' From 1a6f79a47e8ff16af7bcdbf8767b557c77a00522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 19:28:11 +0100 Subject: [PATCH 13/15] zrythm: fix build with meson 0.60 Feature flags were renamed in https://github.com/zrythm/zrythm/commit/2f6ca072f09d14993d60e29f4d5c3fbf5a08be02 and the ffmpeg dependency was dropped in https://github.com/zrythm/zrythm/commit/116b9553913a4616599d259fbe22bc30ffe1ed43 --- pkgs/applications/audio/zrythm/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 8963cff4d12a..70b7fbb745f3 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -13,7 +13,6 @@ , curl , dconf , libepoxy -, ffmpeg , fftw , fftwFloat , flex @@ -95,7 +94,6 @@ stdenv.mkDerivation rec { curl dconf libepoxy - ffmpeg fftw fftwFloat flex @@ -133,10 +131,9 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Denable_ffmpeg=true" - "-Denable_rtmidi=true" - "-Denable_rtaudio=true" - "-Denable_sdl=true" + "-Drtmidi=enabled" + "-Drtaudio=enabled" + "-Dsdl=enabled" "-Dcarla=enabled" "-Dmanpage=true" # "-Duser_manual=true" # needs sphinx-intl From 44d160059b012cf148a86a1e5309bca2d83f62cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 23 Jan 2022 03:33:06 +0100 Subject: [PATCH 14/15] maintainers: add github handle for algorith --- maintainers/maintainer-list.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index db182861c7ba..911acbeb4768 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -515,6 +515,8 @@ }; algorith = { email = "dries_van_daele@telenet.be"; + github = "DriesVanDaele"; + githubId = 1141488; name = "Dries Van Daele"; }; alibabzo = { From d1ad218cc116993218a53a130b4c6d94dc73c355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 23 Jan 2022 03:33:16 +0100 Subject: [PATCH 15/15] mpc_cli: add ncfavier as maintainer --- pkgs/applications/audio/mpc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 82f349216fe4..24ad2804f8ac 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "A minimalist command line interface to MPD"; homepage = "https://www.musicpd.org/clients/mpc/"; license = licenses.gpl2; - maintainers = with maintainers; [ algorith ]; + maintainers = with maintainers; [ algorith ncfavier ]; platforms = with platforms; linux ++ darwin; }; }