From d506e9dd255302d3bacf58c429c48d01cb93cfcf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Jan 2020 23:44:10 +0000 Subject: [PATCH] dino: 2019-10-28 -> 0.1.0 The system libsignal-protocol-c is preferred now, so fetching submodules is no longer required. The other libraries added are ones that the build complained about. I suspect they are optional dependencies. Adding them makes the build quieter, and has basically no impact on runtime closure size, so no harm in making them available to keep the build system happy. --- .../instant-messengers/dino/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 5a133dec83dd..92a3af4ccb42 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,8 @@ , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon -, libnotify, libsoup, libgee +, libnotify, libsoup, libgee, utillinux, libselinux, libsepol, libpsl, brotli +, libsignal-protocol-c , libgcrypt , epoxy , at-spi2-core @@ -14,15 +15,15 @@ , icu }: -stdenv.mkDerivation { - name = "dino-unstable-2019-10-28"; +stdenv.mkDerivation rec { + pname = "dino"; + version = "0.1.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "388cc56674487e7b9e339637369fc55f0e271daf"; - sha256 = "1v8rnjbzi8qhwb1fv787byxk8ygfs16z2j64h0s6sd3asr4n0kz1"; - fetchSubmodules = true; + rev = "v${version}"; + sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54"; }; nativeBuildInputs = [ @@ -51,12 +52,19 @@ stdenv.mkDerivation { pcre xorg.libxcb xorg.libpthreadstubs + xorg.libXtst libXdmcp libxkbcommon epoxy at-spi2-core dbus icu + utillinux + libselinux + libsepol + libpsl + brotli + libsignal-protocol-c ]; enableParallelBuilding = true;