philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

qca2-qt5: remove in favor of libsForQt5.qca-qt5

gstqt5
Thomas Tuegel 2020-09-07 10:10:27 -05:00
parent 5d01b6cb17
commit 210bfccb53
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca2-qt5, libsecret, libXScrnSaver, hunspell
, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell
, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine
libidn qca2-qt5 libsecret libXScrnSaver hunspell
libidn qca-qt5 libsecret libXScrnSaver hunspell
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
];

4
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca2-qt5, libXScrnSaver, hunspell
, libidn, qca-qt5, libXScrnSaver, hunspell
}:
stdenv.mkDerivation rec {
pname = "psi";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [
qtbase qtmultimedia qtx11extras qttools qtwebengine
libidn qca2-qt5 libXScrnSaver hunspell
libidn qca-qt5 libXScrnSaver hunspell
];
enableParallelBuilding = true;
meta = with stdenv.lib; {

6
pkgs/development/libraries/qoauth/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt5, qca2-qt5 }:
{ stdenv, fetchurl, qt5, qca-qt5 }:
stdenv.mkDerivation {
name = "qoauth-2.0.0";
@ -15,10 +15,10 @@ stdenv.mkDerivation {
-e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|'
'';
buildInputs = [ qt5.qtbase qca2-qt5 ];
buildInputs = [ qt5.qtbase qca-qt5 ];
nativeBuildInputs = [ qt5.qmake ];
NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto";
NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto";
NIX_LDFLAGS = "-lqca-qt5";
meta = with stdenv.lib; {

1
pkgs/top-level/all-packages.nix
View File

@ -14767,7 +14767,6 @@ in
qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { };
qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
qca2-qt5 = qca2.override { qt = qt5.qtbase; };
qimageblitz = callPackage ../development/libraries/qimageblitz {};