Skip to content

Commit

Permalink
psi: 1.4 -> 1.5
Browse files Browse the repository at this point in the history
remove useless wrapQtAppsHook and stdenv
  • Loading branch information
freezeboy committed Nov 20, 2020
1 parent d29feee commit 97b51ad
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
19 changes: 11 additions & 8 deletions 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;
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -23179,7 +23179,7 @@ in

ps2client = callPackage ../applications/networking/ps2client { };

psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { };
psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };

psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { };

Expand Down

0 comments on commit 97b51ad

Please sign in to comment.