diff options
| author | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-07 10:13:12 -0500 |
|---|---|---|
| committer | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-07 10:27:29 -0500 |
| commit | 91e0c687ac5503b2dfd665867359b3f6fc86ab3d (patch) | |
| tree | 48a35c618df60b9cb5fc6143cea761f7a03702aa | |
| parent | 210bfccb538e99529e20d9bd8afd0e9a6496a5cb (diff) | |
| download | nixpkgs-91e0c687ac5503b2dfd665867359b3f6fc86ab3d.tar nixpkgs-91e0c687ac5503b2dfd665867359b3f6fc86ab3d.tar.gz nixpkgs-91e0c687ac5503b2dfd665867359b3f6fc86ab3d.tar.bz2 nixpkgs-91e0c687ac5503b2dfd665867359b3f6fc86ab3d.tar.lz nixpkgs-91e0c687ac5503b2dfd665867359b3f6fc86ab3d.tar.xz nixpkgs-91e0c687ac5503b2dfd665867359b3f6fc86ab3d.tar.zst nixpkgs-91e0c687ac5503b2dfd665867359b3f6fc86ab3d.zip | |
qoauth: move to libsForQt5
| -rw-r--r-- | pkgs/development/libraries/qoauth/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 386019a0067..41e4b80d9c3 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 ac0cdd6d175..4e549f652dd 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; |