public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qoauth: move to libsForQt5

Browse Source
This commit is contained in:
Thomas Tuegel 2020-09-07 10:13:12 -05:00
parent 210bfccb53
commit 91e0c687ac
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt5, qca-qt5 }: { stdenv, fetchurl, qtbase, qmake, qca-qt5 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "qoauth-2.0.0"; name = "qoauth-2.0.0";
@ -15,15 +15,15 @@ stdenv.mkDerivation {
-e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|' -e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|'
''; '';
buildInputs = [ qt5.qtbase qca-qt5 ]; buildInputs = [ qtbase qca-qt5 ];
nativeBuildInputs = [ qt5.qmake ]; nativeBuildInputs = [ qmake ];
NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto";
NIX_LDFLAGS = "-lqca-qt5"; NIX_LDFLAGS = "-lqca-qt5";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt library for OAuth authentication"; description = "Qt library for OAuth authentication";
inherit (qt5.qtbase.meta) platforms; inherit (qtbase.meta) platforms;
license = licenses.lgpl21; license = licenses.lgpl21;
}; };
} }

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

@ -14772,8 +14772,6 @@ in
qjson = callPackage ../development/libraries/qjson { }; qjson = callPackage ../development/libraries/qjson { };
qoauth = callPackage ../development/libraries/qoauth { };
qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; qolibri = libsForQt514.callPackage ../applications/misc/qolibri { };
qt3 = callPackage ../development/libraries/qt-3 { qt3 = callPackage ../development/libraries/qt-3 {
@ -14963,7 +14961,10 @@ in
qmltermwidget = callPackage ../development/libraries/qmltermwidget { qmltermwidget = callPackage ../development/libraries/qmltermwidget {
inherit (darwin.apple_sdk.libs) utmp; inherit (darwin.apple_sdk.libs) utmp;
}; };
qmlbox2d = libsForQt5.callPackage ../development/libraries/qmlbox2d { };
qmlbox2d = callPackage ../development/libraries/qmlbox2d { };
qoauth = callPackage ../development/libraries/qoauth { };
qscintilla = callPackage ../development/libraries/qscintilla { qscintilla = callPackage ../development/libraries/qscintilla {
withQt5 = true; withQt5 = true;