pyrox.dev
Merge pull request #122482 from hjones2199/kstars353
+4
-11
pkgs/applications/science/astronomy/kstars/default.nix
+4
-11
pkgs/applications/science/astronomy/kstars/default.nix
···
14
15
mkDerivation rec {
16
pname = "kstars";
17
-
version = "3.5.2";
18
19
src = fetchurl {
20
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
21
-
sha256 = "sha256-iX7rMQbctdK3AeH4ZvH+T4rv1ZHwn55urJh150KoXXU=";
22
};
23
24
-
patches = [
25
-
# Patches ksutils.cpp to use nix store prefixes to find program binaries of
26
-
# indilib and xplanet dependencies. Without the patch, Ekos is unable to spawn
27
-
# indi servers for local telescope/camera control.
28
-
./fs-fixes.patch
29
-
];
30
-
31
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
32
buildInputs = [
33
kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio
···
41
];
42
43
cmakeFlags = [
44
-
"-DINDI_NIX_ROOT=${indi-full}"
45
-
"-DXPLANET_NIX_ROOT=${xplanet}"
46
];
47
48
meta = with lib; {
···
14
15
mkDerivation rec {
16
pname = "kstars";
17
+
version = "3.5.3";
18
19
src = fetchurl {
20
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
21
+
sha256 = "sha256-kgUsG2k2YSAAH7ea2qfGw4gON5CFdUoQ3EwOnATXZ5g=";
22
};
23
24
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
25
buildInputs = [
26
kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio
···
34
];
35
36
cmakeFlags = [
37
+
"-DINDI_PREFIX=${indi-full}"
38
+
"-DXPLANET_PREFIX=${xplanet}"
39
];
40
41
meta = with lib; {
-59
pkgs/applications/science/astronomy/kstars/fs-fixes.patch
-59
pkgs/applications/science/astronomy/kstars/fs-fixes.patch
···
1
-
--- kstars-3.5.0/CMakeLists.txt.old 2020-11-24 12:36:37.967433937 -0600
2
-
+++ kstars-3.5.0/CMakeLists.txt 2020-11-24 13:36:56.275263691 -0600
3
-
@@ -5,6 +5,9 @@
4
-
set (KSTARS_BUILD_RELEASE "Stable")
5
-
set (CMAKE_CXX_STANDARD 11)
6
-
7
-
+add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT})
8
-
+add_definitions(-DXPLANET_NIX_ROOT=${XPLANET_NIX_ROOT})
9
-
+
10
-
# Build KStars Lite with -DBUILD_KSTARS_LITE=ON
11
-
option(BUILD_KSTARS_LITE "Build KStars Lite" OFF)
12
-
13
-
--- kstars-3.5.0/kstars/auxiliary/ksutils.old.cpp 2020-11-24 12:22:14.397319680 -0600
14
-
+++ kstars-3.5.0/kstars/auxiliary/ksutils.cpp 2020-11-24 13:32:22.946477798 -0600
15
-
@@ -1081,6 +1081,10 @@
16
-
// We support running within Snaps, Flatpaks, and AppImage
17
-
// The path should accomodate the differences between the different
18
-
// packaging solutions
19
-
+ #define STR_EXPAND(x) #x
20
-
+ #define STR(x) STR_EXPAND(x)
21
-
+ QString indi_prefix = QString(STR(INDI_NIX_ROOT));
22
-
+ QString xplanet_prefix = QString(STR(XPLANET_NIX_ROOT));
23
-
QString snap = QProcessEnvironment::systemEnvironment().value("SNAP");
24
-
QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST");
25
-
QString appimg = QProcessEnvironment::systemEnvironment().value("APPDIR");
26
-
@@ -1110,21 +1114,21 @@
27
-
#if defined(Q_OS_OSX)
28
-
return "/usr/local/bin/indiserver";
29
-
#endif
30
-
- return prefix + "/bin/indiserver";
31
-
+ return indi_prefix + "/bin/indiserver";
32
-
}
33
-
else if (option == "INDIHubAgent")
34
-
{
35
-
#if defined(Q_OS_OSX)
36
-
return "/usr/local/bin/indihub-agent";
37
-
#endif
38
-
- return prefix + "/bin/indihub-agent";
39
-
+ return indi_prefix + "/bin/indihub-agent";
40
-
}
41
-
else if (option == "indiDriversDir")
42
-
{
43
-
#if defined(Q_OS_OSX)
44
-
return "/usr/local/share/indi";
45
-
#elif defined(Q_OS_LINUX)
46
-
- return prefix + "/share/indi";
47
-
+ return indi_prefix + "/share/indi";
48
-
#else
49
-
return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory);
50
-
#endif
51
-
@@ -1181,7 +1185,7 @@
52
-
#if defined(Q_OS_OSX)
53
-
return "/usr/local/bin/xplanet";
54
-
#endif
55
-
- return prefix + "/bin/xplanet";
56
-
+ return xplanet_prefix + "/bin/xplanet";
57
-
}
58
-
else if (option == "ASTAP")
59
-
{
···
+1
-1
pkgs/development/libraries/science/astronomy/stellarsolver/default.nix
+1
-1
pkgs/development/libraries/science/astronomy/stellarsolver/default.nix