diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index fde8df61048..66fc3ec600f 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -1,17 +1,18 @@ { - stdenv, extra-cmake-modules, fetchurl, + lib, mkDerivation, extra-cmake-modules, fetchurl, kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, - knewstuff, kplotting, kwidgetsaddons, kxmlgui, wrapQtAppsHook, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, knotifyconfig, - qtx11extras, qtwebsockets, + + qtx11extras, qtwebsockets, qtkeychain, libsecret, eigen, zlib, - cfitsio, indilib, xplanet, libnova, gsl + cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kstars"; version = "3.4.3"; @@ -24,23 +25,23 @@ stdenv.mkDerivation rec { ./indi-fix.patch ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio - knewstuff kplotting kwidgetsaddons kxmlgui + knewstuff kplotting kwidgetsaddons kxmlgui knotifyconfig - qtx11extras qtwebsockets + qtx11extras qtwebsockets qtkeychain libsecret eigen zlib - cfitsio indilib xplanet libnova gsl + cfitsio indilib xplanet libnova libraw gsl wcslib ]; cmakeFlags = [ "-DINDI_NIX_ROOT=${indilib}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual planetarium astronomy software"; homepage = "https://kde.org/applications/education/org.kde.kstars"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d9b684b9e7..2df5a25414c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15473,7 +15473,7 @@ in qjson = callPackage ../development/libraries/qjson { }; - qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; + qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { libpng = libpng12;