From 59727bd0617f350190ac7306797477030bcaed97 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Mon, 6 Apr 2026 01:51:33 -0700 Subject: [PATCH] xephem: 4.2.0 -> 4.3.0, fix build --- pkgs/by-name/xe/xephem/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix index d99d801b1db0..d80a7481d940 100644 --- a/pkgs/by-name/xe/xephem/package.nix +++ b/pkgs/by-name/xe/xephem/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, makeDesktopItem, copyDesktopItems, installShellFiles, @@ -16,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xephem"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "XEphem"; repo = "XEphem"; - rev = finalAttrs.version; - hash = "sha256-TuzXrWoJOAHg31DrJObPcHBXgtqR/KWKFRsqddPzL4c="; + tag = finalAttrs.version; + hash = "sha256-zWINscuRO7k/q3u1hngcIkfOpxX75HUxxB2X41igdBg="; }; nativeBuildInputs = [ @@ -40,11 +39,6 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # fix compile error with GCC 14 - (fetchpatch { - url = "https://github.com/XEphem/XEphem/commit/30e14f685ede015fcd8985cd83ee6510f93f0073.patch"; - hash = "sha256-wNoLjR6xEl56ZA6FLBS2xtySeDEYXTCA8j4Z5JIrF6k="; - }) ./add-cross-compilation-support.patch ]; @@ -53,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace xephem.c splash.c --replace-fail '/etc/XEphem' '${placeholder "out"}/etc/XEphem' ''; + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + + enableParallelBuilding = true; + doCheck = true; checkFlags = "-C ../../tests";