22 lib ,
33 stdenv ,
44 fetchFromGitHub ,
5- buildPackages ,
65 vala ,
7- cmake ,
86 ninja ,
97 wrapGAppsHook4 ,
108 pkg-config ,
1513 gtk4 ,
1614 glib-networking ,
1715 libadwaita ,
16+ libcanberra ,
1817 libnotify ,
19- libsoup_2_4 ,
18+ libsoup_3 ,
2019 libgee ,
21- libsignal-protocol -c,
20+ libomemo -c,
2221 libgcrypt ,
22+ meson ,
2323 sqlite ,
2424 gpgme ,
25- pcre2 ,
2625 qrencode ,
2726 icu ,
28- gspell ,
2927 srtp ,
3028 libnice ,
3129 gnutls ,
3432 gst-plugins-good ,
3533 gst-plugins-bad ,
3634 gst-vaapi ,
37- webrtc-audio-processing ,
35+ webrtc-audio-processing_1 ,
3836} :
3937
4038stdenv . mkDerivation ( finalAttrs : {
4139 pname = "dino" ;
42- version = "0.4.5 " ;
40+ version = "0.5.0 " ;
4341
4442 src = fetchFromGitHub {
4543 owner = "dino" ;
4644 repo = "dino" ;
47- rev = "v${ finalAttrs . version } " ;
48- sha256 = "sha256-lF2cUalCrVD6274Ey8wggEXNvKXydlRjvX+815geL1c =" ;
45+ tag = "v${ finalAttrs . version } " ;
46+ hash = "sha256-Y3MGKpfhjmqnIvmt4mXnkmpjF/riXPDXyUiSrsceY6o =" ;
4947 } ;
5048
5149 postPatch = ''
52- # don't overwrite manually set version information
53- substituteInPlace CMakeLists.txt \
54- --replace "include(ComputeVersion)" ""
50+ echo ${ finalAttrs . version } > VERSION
5551 '' ;
5652
5753 nativeBuildInputs = [
5854 vala
59- cmake
60- ninja # https://github.com/dino/dino/issues/230
55+ meson
56+ ninja
6157 pkg-config
6258 wrapGAppsHook4
6359 gettext
@@ -76,11 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
7672 libnotify
7773 gpgme
7874 libgcrypt
79- libsoup_2_4
80- pcre2
75+ libsoup_3
8176 icu
82- libsignal-protocol-c
83- gspell
77+ libcanberra
78+ libomemo-c
8479 srtp
8580 libnice
8681 gnutls
@@ -89,35 +84,22 @@ stdenv.mkDerivation (finalAttrs: {
8984 gst-plugins-good # contains rtpbin, required for VP9
9085 gst-plugins-bad # required for H264, MSDK
9186 gst-vaapi # required for VAAPI
92- webrtc-audio-processing
87+ webrtc-audio-processing_1
9388 ] ;
9489
95- cmakeFlags = [
96- "-DBUILD_TESTS=true"
97- "-DRTP_ENABLE_H264=true"
98- "-DRTP_ENABLE_MSDK=true"
99- "-DRTP_ENABLE_VAAPI=true"
100- "-DRTP_ENABLE_VP9=true"
101- "-DVERSION_FOUND=true"
102- "-DVERSION_IS_RELEASE=true"
103- "-DVERSION_FULL=${ finalAttrs . version } "
104- "-DXGETTEXT_EXECUTABLE=${ lib . getBin buildPackages . gettext } /bin/xgettext"
105- "-DMSGFMT_EXECUTABLE=${ lib . getBin buildPackages . gettext } /bin/msgfmt"
106- "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${ lib . getDev buildPackages . glib } /bin/glib-compile-resources"
107- "-DSOUP_VERSION=${ lib . versions . major libsoup_2_4 . version } "
90+ doCheck = true ;
91+
92+ mesonFlags = [
93+ "-Dplugin-notification-sound=enabled"
94+ "-Dplugin-rtp-h264=enabled"
95+ "-Dplugin-rtp-msdk=enabled"
96+ "-Dplugin-rtp-vaapi=enabled"
97+ "-Dplugin-rtp-vp9=enabled"
10898 ] ;
10999
110100 # Undefined symbols for architecture arm64: "_gpg_strerror"
111101 NIX_LDFLAGS = lib . optionalString stdenv . hostPlatform . isDarwin "-lgpg-error" ;
112102
113- doCheck = true ;
114- checkPhase = ''
115- runHook preCheck
116- ./xmpp-vala-test
117- ./signal-protocol-vala-test
118- runHook postCheck
119- '' ;
120-
121103 # Dino looks for plugins with a .so filename extension, even on macOS where
122104 # .dylib is appropriate, and despite the fact that it builds said plugins with
123105 # that as their filename extension
0 commit comments