cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #104438 from freezeboy/migrate-kstars

Browse source
This commit is contained in:
Doron Behar 2020-12-23 21:40:16 +02:00 committed by GitHub
commit 48c3dc1a40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/science/astronomy/kstars/default.nix
View file

@ -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 = ''

2
pkgs/top-level/all-packages.nix
View file

@ -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;