pyrox.dev
Merge pull request #166400 from bobby285271/entangle
authored by Doron Behar and committed by GitHub e15d6caa 05a7d70e
+14
-6
pkgs/applications/video/entangle/default.nix
+14
-6
pkgs/applications/video/entangle/default.nix
···
1
1
{ lib
2
2
, stdenv
3
3
, fetchFromGitLab
4
-
, cmake
4
+
, fetchpatch
5
+
, itstool
5
6
, libxml2
6
7
, meson
7
8
, ninja
···
49
50
sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0=";
50
51
};
51
52
53
+
patches = [
54
+
# Fix build with meson 0.61, can be removed on next update
55
+
# https://gitlab.com/entangle/entangle/-/issues/67
56
+
(fetchpatch {
57
+
url = "https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch";
58
+
sha256 = "iEgqGjKa0xwSdctwvNdEV361l9nx+bz53xn3fuDgtzY=";
59
+
})
60
+
];
61
+
52
62
nativeBuildInputs = [
53
-
cmake
54
-
glib.dev
55
-
libxml2.bin # for xmllint
63
+
itstool
64
+
glib
65
+
libxml2 # for xmllint
56
66
meson
57
67
ninja
58
68
perl # for pod2man and build scripts
···
92
102
libXdmcp
93
103
libXtst
94
104
]);
95
-
96
-
dontUseCmakeConfigure = true;
97
105
98
106
# Disable building of doc/reference since it requires network connection to render XML to HTML
99
107
# Patch build script shebangs