From 97b51ad5a9847b7337a3b0a5646b9eb0ce2cb2d4 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 5 Nov 2020 19:20:57 +0100 Subject: psi: 1.4 -> 1.5 remove useless wrapQtAppsHook and stdenv --- .../networking/instant-messengers/psi/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 9f841f50dac36..08c3ab96210ff 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +{ lib, mkDerivation, fetchFromGitHub, cmake , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine , libidn, qca-qt5, libXScrnSaver, hunspell }: -stdenv.mkDerivation rec { + +mkDerivation rec { pname = "psi"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "psi-im"; repo = pname; rev = version; - sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; + sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM="; fetchSubmodules = true; }; patches = [ ./fix-cmake-hunspell-1.7.patch ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qttools qtwebengine + qtbase qtmultimedia qtx11extras qtwebengine libidn qca-qt5 libXScrnSaver hunspell ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + + meta = with lib; { + homepage = "https://psi-im.org"; description = "An XMPP (Jabber) client"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } -- cgit 1.4.1