diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix new file mode 100644 index 000000000000..f6865f877d7d --- /dev/null +++ b/pkgs/applications/misc/survex/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchgit +, autoreconfHook +, pkg-config +, wxGTK30-gtk3 +, wxmac +, ffmpeg +, proj +, perl532 +, unscii +, python +, libGL +, libGLU +, xlibsWrapper +, docbook2x +, docbook5 +, Carbon +, Cocoa +}: + +let + perlenv = perl532.withPackages (perlPackages: with perlPackages; [ LocalePO ] ); +in +stdenv.mkDerivation rec { + pname = "survex"; + version = "1.2.44"; + + nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ]; + + buildInputs = [ + libGL libGLU ffmpeg proj + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + wxmac Carbon Cocoa + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + wxGTK30-gtk3 xlibsWrapper + ]; + + src = fetchgit { + url = "git://git.survex.com/survex"; + rev = version; + sha256 = "11gaqmabrf3av665jy3mr0m8hg76fmvnd0g3rghzmyh8d8v6xk34"; + }; + + 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 = '' + 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 + ''; + + meta = with lib; { + description = "Free Software/Open Source software package for mapping caves"; + longDescription = '' + Survex is a Free Software/Open Source software package for mapping caves, + licensed under the GPL. It is designed to be portable and can be run on a + variety of platforms, including Linux/Unix, macOS, and Microsoft Windows. + ''; + homepage = "https://survex.com/"; + changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.matthewcroughan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 066a4d4d9221..6fdeadf3776f 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -2,6 +2,11 @@ , fontforge, SDL, SDL_image, mkfontscale }: +let + perlenv = perl.withPackages (p: with p; [ + TextCharWidth + ]); +in stdenv.mkDerivation rec { pname = "unscii"; version = "1.1"; @@ -12,11 +17,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ (perl.withPackages (p: [ p.TextCharWidth ])) + [ perlenv bdftopcf fontforge SDL SDL_image mkfontscale ]; + # Fixes shebang -> wrapper problem on Darwin + postPatch = '' + for perltool in *.pl; do + substituteInPlace Makefile \ + --replace "./$perltool" "${perlenv}/bin/perl ./$perltool" + done + ''; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + preConfigure = '' patchShebangs . ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1a1c14fb6b2..bd885a03b8e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26829,6 +26829,10 @@ in git = gitMinimal; }; + survex = callPackage ../applications/misc/survex { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + sunvox = callPackage ../applications/audio/sunvox { }; svkbd = callPackage ../applications/accessibility/svkbd { };