Merge pull request #156192 from ncfavier/fix-meson-builds
This commit is contained in:
commit
98870a6bfa
|
@ -515,6 +515,8 @@
|
||||||
};
|
};
|
||||||
algorith = {
|
algorith = {
|
||||||
email = "dries_van_daele@telenet.be";
|
email = "dries_van_daele@telenet.be";
|
||||||
|
github = "DriesVanDaele";
|
||||||
|
githubId = 1141488;
|
||||||
name = "Dries Van Daele";
|
name = "Dries Van Daele";
|
||||||
};
|
};
|
||||||
alibabzo = {
|
alibabzo = {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-2FjYBfak0IjibuU+CNQ0y9Ei8hTZhynS/BK2DNerhVw=";
|
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 ];
|
buildInputs = [ libmpdclient ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config sphinx ];
|
nativeBuildInputs = [ meson ninja pkg-config sphinx ];
|
||||||
|
@ -28,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "A minimalist command line interface to MPD";
|
description = "A minimalist command line interface to MPD";
|
||||||
homepage = "https://www.musicpd.org/clients/mpc/";
|
homepage = "https://www.musicpd.org/clients/mpc/";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with maintainers; [ algorith ];
|
maintainers = with maintainers; [ algorith ncfavier ];
|
||||||
platforms = with platforms; linux ++ darwin;
|
platforms = with platforms; linux ++ darwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
|
||||||
hicolor-icon-theme
|
hicolor-icon-theme
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [ "-Dlibreoffice=false" ];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x data/meson_post_install.py
|
chmod +x data/meson_post_install.py
|
||||||
patchShebangs data/meson_post_install.py
|
patchShebangs data/meson_post_install.py
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
, curl
|
, curl
|
||||||
, dconf
|
, dconf
|
||||||
, libepoxy
|
, libepoxy
|
||||||
, ffmpeg
|
|
||||||
, fftw
|
, fftw
|
||||||
, fftwFloat
|
, fftwFloat
|
||||||
, flex
|
, flex
|
||||||
|
@ -95,7 +94,6 @@ stdenv.mkDerivation rec {
|
||||||
curl
|
curl
|
||||||
dconf
|
dconf
|
||||||
libepoxy
|
libepoxy
|
||||||
ffmpeg
|
|
||||||
fftw
|
fftw
|
||||||
fftwFloat
|
fftwFloat
|
||||||
flex
|
flex
|
||||||
|
@ -133,10 +131,9 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Denable_ffmpeg=true"
|
"-Drtmidi=enabled"
|
||||||
"-Denable_rtmidi=true"
|
"-Drtaudio=enabled"
|
||||||
"-Denable_rtaudio=true"
|
"-Dsdl=enabled"
|
||||||
"-Denable_sdl=true"
|
|
||||||
"-Dcarla=enabled"
|
"-Dcarla=enabled"
|
||||||
"-Dmanpage=true"
|
"-Dmanpage=true"
|
||||||
# "-Duser_manual=true" # needs sphinx-intl
|
# "-Duser_manual=true" # needs sphinx-intl
|
||||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
--replace "install_dir: rulesdir" "install_dir: datadir" \
|
--replace "install_dir: rulesdir" "install_dir: datadir" \
|
||||||
'';
|
'';
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Dsystemd=true"
|
"-Dservice_manager=systemd"
|
||||||
"-Dsample_config=false"
|
"-Dsample_config=false"
|
||||||
"-Ddebug_tool=false"
|
"-Ddebug_tool=false"
|
||||||
];
|
];
|
||||||
|
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ];
|
mesonFlags = [ "-Dwith-lua=lua" "-Dtext-frontend=true" ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH"
|
wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH"
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, meson
|
, meson
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, ninja
|
, ninja
|
||||||
|
@ -25,6 +26,13 @@ python3Packages.buildPythonApplication rec {
|
||||||
sha256 = "0b2slm7kjq6q8c7v4m7aqc8m1ynjxn3bl7445srpv1xc0dilq403";
|
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 = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, arcan
|
, arcan
|
||||||
, audit
|
, audit
|
||||||
, dbus
|
, dbus
|
||||||
|
@ -46,6 +47,14 @@ stdenv.mkDerivation rec {
|
||||||
hash = "sha256-UTIVDKnYD/q0K6G7NJUKh1tHcqnsuiJ/cQxWuPMJ2G4=";
|
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 = [
|
nativeBuildInputs = [
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
|
|
|
@ -19,7 +19,9 @@ in {
|
||||||
sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j";
|
sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j";
|
||||||
};
|
};
|
||||||
|
|
||||||
mesonFlags = mesonFlags ++ [
|
mesonFlags = [
|
||||||
|
# Include virtual drivers for fprintd tests
|
||||||
|
"-Ddrivers=all"
|
||||||
"-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d"
|
"-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -15,12 +15,17 @@ in stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
|
nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
|
||||||
buildInputs = [ glib libgee json-glib libsoup libarchive ];
|
buildInputs = [ glib libgee json-glib libsoup libarchive ];
|
||||||
|
|
||||||
# Fixes build with vala >=0.42
|
|
||||||
patches = [
|
patches = [
|
||||||
|
# Fixes build with vala >=0.42
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch";
|
url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch";
|
||||||
sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f";
|
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" ];
|
mesonFlags = [ "-Denable_valadoc=true" ];
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
, cmake
|
, cmake
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
|
@ -27,6 +28,11 @@ stdenv.mkDerivation rec {
|
||||||
patches = [
|
patches = [
|
||||||
# https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/150
|
# https://gitlab.gnome.org/GNOME/retro-gtk/-/merge_requests/150
|
||||||
./gio-unix.patch
|
./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 = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, libdrm
|
, libdrm
|
||||||
, libpciaccess
|
, libpciaccess
|
||||||
|
@ -45,6 +46,14 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1dwvxh1yplsh1a7h3gpp40g91v12cfxy6yy99s1v9yr2kwxikm1n";
|
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 ];
|
nativeBuildInputs = [ pkg-config utilmacros meson ninja flex bison gtk-doc docutils docbook_xsl ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libdrm
|
libdrm
|
||||||
|
|
|
@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
|
||||||
echo -n > server/meson.build
|
echo -n > server/meson.build
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mesonFlags = [ "-Doverride_server_path=${prebuilt_server}" ];
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p "$out/share/scrcpy"
|
mkdir -p "$out/share/scrcpy"
|
||||||
ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server"
|
ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server"
|
||||||
|
|
|
@ -105,11 +105,7 @@ in multiStdenv.mkDerivation rec {
|
||||||
"-Dwith-bitbridge=true"
|
"-Dwith-bitbridge=true"
|
||||||
|
|
||||||
# Requires CMake and is unnecessary
|
# Requires CMake and is unnecessary
|
||||||
"-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled"
|
"-Dtomlplusplus:generate_cmake_config=false"
|
||||||
|
|
||||||
# tomlplusplus examples and tests don't build with winegcc
|
|
||||||
"-Dtomlplusplus:BUILD_EXAMPLES=disabled"
|
|
||||||
"-Dtomlplusplus:BUILD_TESTS=disabled"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
Loading…
Reference in a new issue