diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 386019a00672..41e4b80d9c3a 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, qca-qt5 }: +{ stdenv, fetchurl, qtbase, qmake, qca-qt5 }: stdenv.mkDerivation { name = "qoauth-2.0.0"; @@ -15,15 +15,15 @@ stdenv.mkDerivation { -e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|' ''; - buildInputs = [ qt5.qtbase qca-qt5 ]; - nativeBuildInputs = [ qt5.qmake ]; + buildInputs = [ qtbase qca-qt5 ]; + nativeBuildInputs = [ qmake ]; NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; - inherit (qt5.qtbase.meta) platforms; + inherit (qtbase.meta) platforms; license = licenses.lgpl21; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac0cdd6d175e..4e549f652dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14772,8 +14772,6 @@ in qjson = callPackage ../development/libraries/qjson { }; - qoauth = callPackage ../development/libraries/qoauth { }; - qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { @@ -14963,7 +14961,10 @@ in qmltermwidget = callPackage ../development/libraries/qmltermwidget { 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 { withQt5 = true;