survex: 1.2.44 -> 1.4.1

* survex: 1.2.44 -> 1.4.1 (#160899)

Use source tarball to get man pages out of the box
Depend on `proj` 8.x and `python3`
Need GApps wrapping or it crashes

* survex: disable check phase on Darwin
This commit is contained in:
Renaud 2022-02-24 19:06:13 +01:00 committed by GitHub
parent 0c8e2c76ff
commit c5d25af730
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,68 +1,61 @@
{ lib { lib
, stdenv , stdenv
, fetchgit , fetchurl
, autoreconfHook
, pkg-config
, wxGTK30-gtk3
, wxmac
, ffmpeg
, proj_7
, perl532
, unscii
, python2
, libGL
, libGLU
, xlibsWrapper
, docbook2x
, docbook5
, Carbon , Carbon
, Cocoa , Cocoa
, ffmpeg
, glib
, libGLU
, mesa
, perl
, pkg-config
, proj
, python3
, wrapGAppsHook
, wxGTK30-gtk3
, wxmac
, xlibsWrapper
}: }:
let
perlenv = perl532.withPackages (perlPackages: with perlPackages; [ LocalePO ] );
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "survex"; pname = "survex";
version = "1.2.44"; version = "1.4.1";
nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python2 ]; nativeBuildInputs = [
perl
buildInputs = [ pkg-config
libGL libGLU ffmpeg proj_7 python3
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ wrapGAppsHook
wxmac Carbon Cocoa
] ++ lib.optionals stdenv.hostPlatform.isLinux [
wxGTK30-gtk3 xlibsWrapper
]; ];
src = fetchgit { buildInputs = [
url = "git://git.survex.com/survex"; ffmpeg
rev = version; glib
sha256 = "11gaqmabrf3av665jy3mr0m8hg76fmvnd0g3rghzmyh8d8v6xk34"; libGLU
mesa
proj
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Carbon
Cocoa
wxmac
] ++ lib.optionals stdenv.hostPlatform.isLinux [
wxGTK30-gtk3
xlibsWrapper
];
src = fetchurl {
url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz";
hash = "sha256-69X1jGjBTQIQzkD1mTZTzE8L/GXnnf5SI52l7eIiLz4=";
}; };
enableParallelBuilding = true;
# Docs rely on sgmltools-lite, a package that would be quite complex to
# provide as it is quite old. So this preConfigure hook effectively disables
# the doc generation. An example of packaging sgmltools-lite from Gentoo can
# be found here:
# https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild?id=0b8b716331049599ea3299981e3a9ea6e258c5e0
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
echo "" > doc/Makefile.am
# substituteInPlace doc/Makefile --replace "docbook2man" "docbook2man --sgml" # Will be needed once sgmltools-lite is packaged.
for perltool in './extract-msgs.pl' './gettexttomsg.pl' '$(srcdir)/gdtconvert' '$(srcdir)/gen_img2aven'; do
substituteInPlace src/Makefile.am \
--replace "$perltool" "${perlenv}/bin/perl $perltool"
done
substituteInPlace lib/Makefile.am \
--replace '$(srcdir)/make-pixel-font' '${perlenv}/bin/perl $(srcdir)/make-pixel-font'
substituteInPlace lib/make-pixel-font --replace /usr/share/unifont/unifont.hex ${unscii.extra}/share/fonts/misc/unifont.hex
''; '';
enableParallelBuilding = true;
doCheck = (!stdenv.isDarwin); # times out
enableParallelChecking = false;
meta = with lib; { meta = with lib; {
description = "Free Software/Open Source software package for mapping caves"; description = "Free Software/Open Source software package for mapping caves";
longDescription = '' longDescription = ''
@ -71,7 +64,7 @@ stdenv.mkDerivation rec {
variety of platforms, including Linux/Unix, macOS, and Microsoft Windows. variety of platforms, including Linux/Unix, macOS, and Microsoft Windows.
''; '';
homepage = "https://survex.com/"; homepage = "https://survex.com/";
changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS"; changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ maintainers.matthewcroughan ]; maintainers = [ maintainers.matthewcroughan ];
platforms = platforms.all; platforms = platforms.all;