entangle: fix build with meson 0.61

main
Bobby Rong 2 years ago
parent 6a079dad15
commit a8dfd8fdac
No known key found for this signature in database
GPG Key ID: ED07364437C91161
  1. 20
      pkgs/applications/video/entangle/default.nix

@ -1,7 +1,8 @@
{ lib
, stdenv
, fetchFromGitLab
, cmake
, fetchpatch
, itstool
, libxml2
, meson
, ninja
@ -49,10 +50,19 @@ stdenv.mkDerivation rec {
sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";
};
patches = [
# Fix build with meson 0.61, can be removed on next update
# https://gitlab.com/entangle/entangle/-/issues/67
(fetchpatch {
url = "https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch";
sha256 = "iEgqGjKa0xwSdctwvNdEV361l9nx+bz53xn3fuDgtzY=";
})
];
nativeBuildInputs = [
cmake
glib.dev
libxml2.bin # for xmllint
itstool
glib
libxml2 # for xmllint
meson
ninja
perl # for pod2man and build scripts
@ -93,8 +103,6 @@ stdenv.mkDerivation rec {
libXtst
]);
dontUseCmakeConfigure = true;
# Disable building of doc/reference since it requires network connection to render XML to HTML
# Patch build script shebangs
postPatch = ''

Loading…
Cancel
Save