diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-05 04:25:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 04:25:48 +0100 |
| commit | 2c0e6a0e69af6c9a132f93d8500d50606e074f1f (patch) | |
| tree | a8ee6c5437136260ce68512ba5f7e9243317f9ac /pkgs/applications | |
| parent | 618010563d3951df66a41e616dee4a1e6edac779 (diff) | |
| parent | 62249b7904cee7581e6eb046ee77b268926bca10 (diff) | |
Merge pull request #114586 from hjones2199/indi-full
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/science/astronomy/kstars/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/science/astronomy/phd2/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index 33f00979c972f..47c69d7451f74 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -9,7 +9,7 @@ eigen, zlib, - cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib, stellarsolver + cfitsio, indi-full, xplanet, libnova, libraw, gsl, wcslib, stellarsolver }: mkDerivation rec { @@ -37,11 +37,11 @@ mkDerivation rec { eigen zlib - cfitsio indilib xplanet libnova libraw gsl wcslib stellarsolver + cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver ]; cmakeFlags = [ - "-DINDI_NIX_ROOT=${indilib}" + "-DINDI_NIX_ROOT=${indi-full}" "-DXPLANET_NIX_ROOT=${xplanet}" ]; @@ -53,7 +53,7 @@ mkDerivation rec { The display includes up to 100 million stars, 13.000 deep-sky objects, all 8 planets, the Sun and Moon, and thousands of comets, asteroids, supernovae, and satellites. For students and teachers, it supports adjustable simulation speeds in order to view phenomena that happen over long timescales, the KStars Astrocalculator to predict conjunctions, and many common astronomical calculations. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ timput hjones2199 ]; }; diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 054a73dec7a05..0e0ad06bbe9f5 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3, - curl, gettext, glib, indilib, libnova, wrapGAppsHook }: + curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "phd2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ]; + buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indi-full libnova ]; cmakeFlags = [ "-DOPENSOURCE_ONLY=1" |