From d4077929d6f7f02d75b85f9a5648890db474bde4 Mon Sep 17 00:00:00 2001
From: Hunter Jones <hunter.jones@ultra-ats.com>
Date: Mon, 10 May 2021 15:16:04 -0500
Subject: [PATCH] kstars: 3.5.2 -> 3.5.3
---
.../science/astronomy/kstars/default.nix | 15 ++---
.../science/astronomy/kstars/fs-fixes.patch | 59 -------------------
2 files changed, 4 insertions(+), 70 deletions(-)
delete mode 100644 pkgs/applications/science/astronomy/kstars/fs-fixes.patch
diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix
index cd7405ae09d9..861dc66293ee 100644
--- a/pkgs/applications/science/astronomy/kstars/default.nix
+++ b/pkgs/applications/science/astronomy/kstars/default.nix
@@ -14,20 +14,13 @@
mkDerivation rec {
pname = "kstars";
- version = "3.5.2";
+ version = "3.5.3";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
- sha256 = "sha256-iX7rMQbctdK3AeH4ZvH+T4rv1ZHwn55urJh150KoXXU=";
+ sha256 = "sha256-kgUsG2k2YSAAH7ea2qfGw4gON5CFdUoQ3EwOnATXZ5g=";
};
- patches = [
- # Patches ksutils.cpp to use nix store prefixes to find program binaries of
- # indilib and xplanet dependencies. Without the patch, Ekos is unable to spawn
- # indi servers for local telescope/camera control.
- ./fs-fixes.patch
- ];
-
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio
@@ -41,8 +34,8 @@ mkDerivation rec {
];
cmakeFlags = [
- "-DINDI_NIX_ROOT=${indi-full}"
- "-DXPLANET_NIX_ROOT=${xplanet}"
+ "-DINDI_PREFIX=${indi-full}"
+ "-DXPLANET_PREFIX=${xplanet}"
];
meta = with lib; {
diff --git a/pkgs/applications/science/astronomy/kstars/fs-fixes.patch b/pkgs/applications/science/astronomy/kstars/fs-fixes.patch
deleted file mode 100644
index b9bdfc0c5dea..000000000000
--- a/pkgs/applications/science/astronomy/kstars/fs-fixes.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- kstars-3.5.0/CMakeLists.txt.old 2020-11-24 12:36:37.967433937 -0600
-+++ kstars-3.5.0/CMakeLists.txt 2020-11-24 13:36:56.275263691 -0600
-@@ -5,6 +5,9 @@
- set (KSTARS_BUILD_RELEASE "Stable")
- set (CMAKE_CXX_STANDARD 11)
-
-+add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT})
-+add_definitions(-DXPLANET_NIX_ROOT=${XPLANET_NIX_ROOT})
-+
- # Build KStars Lite with -DBUILD_KSTARS_LITE=ON
- option(BUILD_KSTARS_LITE "Build KStars Lite" OFF)
-
---- kstars-3.5.0/kstars/auxiliary/ksutils.old.cpp 2020-11-24 12:22:14.397319680 -0600
-+++ kstars-3.5.0/kstars/auxiliary/ksutils.cpp 2020-11-24 13:32:22.946477798 -0600
-@@ -1081,6 +1081,10 @@
- // We support running within Snaps, Flatpaks, and AppImage
- // The path should accomodate the differences between the different
- // packaging solutions
-+ #define STR_EXPAND(x) #x
-+ #define STR(x) STR_EXPAND(x)
-+ QString indi_prefix = QString(STR(INDI_NIX_ROOT));
-+ QString xplanet_prefix = QString(STR(XPLANET_NIX_ROOT));
- QString snap = QProcessEnvironment::systemEnvironment().value("SNAP");
- QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST");
- QString appimg = QProcessEnvironment::systemEnvironment().value("APPDIR");
-@@ -1110,21 +1114,21 @@
- #if defined(Q_OS_OSX)
- return "/usr/local/bin/indiserver";
- #endif
-- return prefix + "/bin/indiserver";
-+ return indi_prefix + "/bin/indiserver";
- }
- else if (option == "INDIHubAgent")
- {
- #if defined(Q_OS_OSX)
- return "/usr/local/bin/indihub-agent";
- #endif
-- return prefix + "/bin/indihub-agent";
-+ return indi_prefix + "/bin/indihub-agent";
- }
- else if (option == "indiDriversDir")
- {
- #if defined(Q_OS_OSX)
- return "/usr/local/share/indi";
- #elif defined(Q_OS_LINUX)
-- return prefix + "/share/indi";
-+ return indi_prefix + "/share/indi";
- #else
- return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory);
- #endif
-@@ -1181,7 +1185,7 @@
- #if defined(Q_OS_OSX)
- return "/usr/local/bin/xplanet";
- #endif
-- return prefix + "/bin/xplanet";
-+ return xplanet_prefix + "/bin/xplanet";
- }
- else if (option == "ASTAP")
- {