From b5afd5924dbda626d1c70902bfaa21a74fd3766d Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 11 Feb 2023 21:03:21 +0100 Subject: dino: 0.3.1 -> 0.4.0 (#215211) https://github.com/dino/dino/releases/tag/v0.4.0 Switched to gtk4, cleaned up dependencies and tested in a MUC. --- .../networking/instant-messengers/dino/default.nix | 67 +++++++++++++--------- 1 file changed, 40 insertions(+), 27 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 5a65b43a8acb8..d9288c4a44645 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,37 +1,48 @@ { lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext -, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking -, xorg, libXdmcp, libxkbcommon +, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking +, libadwaita , libnotify, libsoup, libgee -, librsvg, libsignal-protocol-c +, libsignal-protocol-c , libgcrypt -, libepoxy -, at-spi2-core , sqlite -, dbus , gpgme -, pcre +, pcre2 , qrencode , icu , gspell -, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing - }: +, srtp +, libnice +, gnutls +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-vaapi +, webrtc-audio-processing +}: stdenv.mkDerivation rec { pname = "dino"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s="; + sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ="; }; + postPatch = '' + # don't overwrite manually set version information + substituteInPlace CMakeLists.txt \ + --replace "include(ComputeVersion)" "" + ''; + nativeBuildInputs = [ vala cmake - ninja + ninja # https://github.com/dino/dino/issues/230 pkg-config wrapGAppsHook gettext @@ -40,40 +51,42 @@ stdenv.mkDerivation rec { buildInputs = [ qrencode gobject-introspection - glib-networking glib + glib-networking # required for TLS support + libadwaita libgee - gnome.adwaita-icon-theme sqlite gdk-pixbuf - gtk3 + gtk4 libnotify gpgme libgcrypt libsoup - pcre - libepoxy - at-spi2-core - dbus + pcre2 icu libsignal-protocol-c - librsvg gspell srtp libnice gnutls gstreamer gst-plugins-base - gst-plugins-good + gst-plugins-good # contains rtpbin, required for VP9 + gst-plugins-bad # required for H264, MSDK + gst-vaapi # required for VAAPI webrtc-audio-processing - ] ++ lib.optionals (!stdenv.isDarwin) [ - xorg.libxcb - xorg.libpthreadstubs - libXdmcp - libxkbcommon ]; - cmakeFlags = ["-DBUILD_TESTS=yes"]; + cmakeFlags = [ + "-DBUILD_TESTS=true" + "-DRTP_ENABLE_H264=true" + "-DRTP_ENABLE_MSDK=true" + "-DRTP_ENABLE_VAAPI=true" + "-DRTP_ENABLE_VP9=true" + "-DVERSION_FOUND=true" + "-DVERSION_IS_RELEASE=true" + "-DVERSION_FULL=${version}" + ]; # Undefined symbols for architecture arm64: "_gpg_strerror" NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; -- cgit 1.4.1