mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 15:56:50 +01:00
psi-plus: 1.4.504 -> 1.4.904
libsForQt5 is needed for qtkeychain.
This commit is contained in:
parent
1357d10048
commit
8f5bafe599
2 changed files with 9 additions and 9 deletions
|
@ -1,24 +1,25 @@
|
|||
{ stdenv, fetchFromGitHub, cmake
|
||||
, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell
|
||||
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
|
||||
, libidn, qca2-qt5, qtkeychain, libXScrnSaver, hunspell
|
||||
, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "psi-plus";
|
||||
version = "1.4.504";
|
||||
version = "1.4.904";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psi-plus";
|
||||
repo = "psi-plus-snapshots";
|
||||
rev = version;
|
||||
sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
|
||||
sha256 = "1bs7yk3qp91sm8nb9gna8vm59381afn1wfs7aii9yi29bhx6fw9h";
|
||||
};
|
||||
|
||||
resources = fetchFromGitHub {
|
||||
owner = "psi-plus";
|
||||
repo = "resources";
|
||||
rev = "d623f57db35eb5af81ccdf69b2cbe1c437190f29";
|
||||
sha256 = "024cyazyxka5vcbjrkkw32c5zw6aa70n50fdp6zh5v5c51d9ci8k";
|
||||
rev = "182c92ca0bcc055579d8c91bccba9efe157e77a9";
|
||||
sha256 = "06k7q63cxpifpzjnlw1snclkr2mwf9fh71cgfd40n7jgzswzwhpb";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
@ -32,8 +33,8 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit
|
||||
libidn qca2-qt5 libXScrnSaver hunspell
|
||||
qtbase qtmultimedia qtx11extras qttools qtwebengine
|
||||
libidn qca2-qt5 qtkeychain libXScrnSaver hunspell
|
||||
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
|
||||
];
|
||||
|
||||
|
@ -44,6 +45,5 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ orivej ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -20326,7 +20326,7 @@ in
|
|||
|
||||
psi = callPackage ../applications/networking/instant-messengers/psi { };
|
||||
|
||||
psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { };
|
||||
psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
|
||||
|
||||
psol = callPackage ../development/libraries/psol { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue