@@ -1,68 +1,61 @@
11{ lib
22, stdenv
3−, fetchgit
4−, autoreconfHook
3+, fetchurl
4+, Carbon
5+, Cocoa
6+, ffmpeg
7+, glib
8+, libGLU
9+, mesa
10+, perl
511, pkg-config
12+, proj
13+, python3
14+, wrapGAppsHook
615, wxGTK30-gtk3
716, wxmac
8−, ffmpeg
9−, proj_7
10−, perl532
11−, unscii
12−, python2
13−, libGL
14−, libGLU
1517, xlibsWrapper
16−, docbook2x
17−, docbook5
18−, Carbon
19−, Cocoa
2018}:
2119
22−let
23− perlenv = perl532.withPackages (perlPackages: with perlPackages; [ LocalePO ] );
24−in
2520stdenv.mkDerivation rec {
2621 pname = "survex";
27− version = "1.2.44";
22+ version = "1.4.1";
2823
29− nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python2 ];
24+ nativeBuildInputs = [
25+ perl
26+ pkg-config
27+ python3
28+ wrapGAppsHook
29+ ];
3030
3131 buildInputs = [
32− libGL libGLU ffmpeg proj_7
32+ ffmpeg
33+ glib
34+ libGLU
35+ mesa
36+ proj
3337 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
34− wxmac Carbon Cocoa
38+ Carbon
39+ Cocoa
40+ wxmac
3541 ] ++ lib.optionals stdenv.hostPlatform.isLinux [
36− wxGTK30-gtk3 xlibsWrapper
42+ wxGTK30-gtk3
43+ xlibsWrapper
3744 ];
3845
39− src = fetchgit {
40− url = "git://git.survex.com/survex";
41− rev = version;
42− sha256 = "11gaqmabrf3av665jy3mr0m8hg76fmvnd0g3rghzmyh8d8v6xk34";
46+ src = fetchurl {
47+ url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
48+ hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4=";
4349 };
4450
45− enableParallelBuilding = true;
46−
47− # Docs rely on sgmltools-lite, a package that would be quite complex to
48− # provide as it is quite old. So this preConfigure hook effectively disables
49− # the doc generation. An example of packaging sgmltools-lite from Gentoo can
50− # be found here:
51− # https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild?id=0b8b716331049599ea3299981e3a9ea6e258c5e0
52−
5351 postPatch = ''
5452 patchShebangs .
55− echo "" > doc/Makefile.am
56− # substituteInPlace doc/Makefile --replace "docbook2man" "docbook2man --sgml" # Will be needed once sgmltools-lite is packaged.
57− for perltool in './extract-msgs.pl' './gettexttomsg.pl' '$(srcdir)/gdtconvert' '$(srcdir)/gen_img2aven'; do
58− substituteInPlace src/Makefile.am \
59− --replace "$perltool" "${perlenv}/bin/perl $perltool"
60− done
61− substituteInPlace lib/Makefile.am \
62− --replace '$(srcdir)/make-pixel-font' '${perlenv}/bin/perl $(srcdir)/make-pixel-font'
63− substituteInPlace lib/make-pixel-font --replace /usr/share/unifont/unifont.hex ${unscii.extra}/share/fonts/misc/unifont.hex
6453 '';
6554
55+ enableParallelBuilding = true;
56+ doCheck = (!stdenv.isDarwin); # times out
57+ enableParallelChecking = false;
58+
6659 meta = with lib; {
6760 description = "Free Software/Open Source software package for mapping caves";
6861 longDescription = ''
@@ -71,7 +64,7 @@ stdenv.mkDerivation rec {
7164 variety of platforms, including Linux/Unix, macOS, and Microsoft Windows.
7265 '';
7366 homepage = "https://survex.com/";
74− changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS";
67+ changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS";
7568 license = licenses.gpl2Plus;
7669 maintainers = [ maintainers.matthewcroughan ];
7770 platforms = platforms.all;