Skip to content

Commit 52ff322

Browse files
committed
xephem: 4.2.0 -> 4.3.0, fix build, move icon to spec-compliant location
1 parent f0bc2e4 commit 52ff322

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

pkgs/by-name/xe/xephem/package.nix

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
lib,
33
stdenv,
44
fetchFromGitHub,
5-
fetchpatch,
65
makeDesktopItem,
76
copyDesktopItems,
87
installShellFiles,
@@ -16,13 +15,13 @@
1615

1716
stdenv.mkDerivation (finalAttrs: {
1817
pname = "xephem";
19-
version = "4.2.0";
18+
version = "4.3.0";
2019

2120
src = fetchFromGitHub {
2221
owner = "XEphem";
2322
repo = "XEphem";
2423
rev = finalAttrs.version;
25-
hash = "sha256-TuzXrWoJOAHg31DrJObPcHBXgtqR/KWKFRsqddPzL4c=";
24+
hash = "sha256-zWINscuRO7k/q3u1hngcIkfOpxX75HUxxB2X41igdBg=";
2625
};
2726

2827
nativeBuildInputs = [
@@ -40,11 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
4039
];
4140

4241
patches = [
43-
# fix compile error with GCC 14
44-
(fetchpatch {
45-
url = "https://github.com/XEphem/XEphem/commit/30e14f685ede015fcd8985cd83ee6510f93f0073.patch";
46-
hash = "sha256-wNoLjR6xEl56ZA6FLBS2xtySeDEYXTCA8j4Z5JIrF6k=";
47-
})
4842
./add-cross-compilation-support.patch
4943
];
5044

@@ -53,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
5347
substituteInPlace xephem.c splash.c --replace-fail '/etc/XEphem' '${placeholder "out"}/etc/XEphem'
5448
'';
5549

50+
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
51+
5652
doCheck = true;
5753

5854
checkFlags = "-C ../../tests";
@@ -79,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
7975
mkdir $out/etc
8076
echo "XEphem.ShareDir: $out/share/xephem" > $out/etc/XEphem
8177
installManPage xephem.1
82-
install -Dm644 XEphem.png -t $out/share/pixmaps
78+
install -Dm644 XEphem.png -t $out/share/icons/hicolor/128x128/apps
8379
runHook postInstall
8480
'';
8581

0 commit comments

Comments
 (0)