ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 13:16:40 +03:00
Code Issues Projects Releases Wiki Activity

entangle: fix build with meson 0.61

Browse Source
This commit is contained in:
Bobby Rong 2022-03-30 18:18:23 +08:00
parent 6a079dad15
commit a8dfd8fdac
No known key found for this signature in database
GPG Key ID: ED07364437C91161
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/video/entangle/default.nix
View File

@ -1,7 +1,8 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, cmake , fetchpatch
, itstool
, libxml2 , libxml2
, meson , meson
, ninja , ninja
@ -49,10 +50,19 @@ stdenv.mkDerivation rec {
sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0="; 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 = [ nativeBuildInputs = [
cmake itstool
glib.dev glib
libxml2.bin # for xmllint libxml2 # for xmllint
meson meson
ninja ninja
perl # for pod2man and build scripts perl # for pod2man and build scripts
@ -93,8 +103,6 @@ stdenv.mkDerivation rec {
libXtst libXtst
]); ]);
dontUseCmakeConfigure = true;
# Disable building of doc/reference since it requires network connection to render XML to HTML # Disable building of doc/reference since it requires network connection to render XML to HTML
# Patch build script shebangs # Patch build script shebangs
postPatch = '' postPatch = ''