summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/editors/texmacs
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2019-06-30 04:22:21 +0200
committerNiklas Hambüchen <mail@nh2.me>2019-06-30 04:22:21 +0200
commitb69542ae15a05390258bb7267a842a33fe9577db (patch)
tree0413fd9b8eb8320bb243323652c1cfd8786cbf08 /pkgs/applications/editors/texmacs
parent5b7e3718ee3dc1c6f0bebd4c76816a0003e8f295 (diff)
texmacs: 1.99.2 -> 1.99.10
Packaging changes: * Switch from autoconf to cmake. Fixes error checking for guile-config... guile-config sh: =~: unknown operand ./configure: ./configure.lineno: line 8057: syntax error: bad substitution that appared with the new version. * Also add new dependencies for new features: git, python * (fixes all "missing" errors in cmake's output) * Stay at Qt4 for now to not introduce too many changes * Upgrading to Qt5 in the future is feasible (#33248); it builds * I'm not doing it here because Qt5 apps apparently don't run yet on non-NixOS
Diffstat (limited to 'pkgs/applications/editors/texmacs')
-rw-r--r--pkgs/applications/editors/texmacs/default.nix35
1 files changed, 31 insertions, 4 deletions
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index 2c391cae517b..31160c0916c5 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -1,7 +1,13 @@
{ stdenv, callPackage,
fetchurl, guile_1_8, qt4, xmodmap, which, makeWrapper, freetype,
+ libjpeg,
+ sqlite,
tex ? null,
aspell ? null,
+ git ? null,
+ python3 ? null,
+ cmake,
+ pkgconfig,
ghostscriptX ? null,
extraFonts ? false,
chineseFonts ? false,
@@ -10,7 +16,7 @@
let
pname = "TeXmacs";
- version = "1.99.2";
+ version = "1.99.10";
common = callPackage ./common.nix {
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
};
@@ -19,17 +25,38 @@ stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
- url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
- sha256 = "0l48g9746igiaxw657shm8g3xxk565vzsviajlrxqyljbh6py0fs";
+ url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
+ sha256 = "1k12bkcik7mv93q0j7q3b77x8s6rmvlb23s3v7nnzdwjxlp5lph2";
};
- buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ];
+ cmakeFlags = [
+ # Texmacs' cmake build as of writing defaults to Qt5,
+ # but we haven't updated to that yet.
+ "-DTEXMACS_GUI=Qt4"
+ ];
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [
+ guile_1_8
+ qt4
+ makeWrapper
+ ghostscriptX
+ freetype
+ libjpeg
+ sqlite
+ git
+ python3
+ ];
NIX_LDFLAGS = [ "-lz" ];
postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
(if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
(if aspell == null then "" else "${aspell}/bin:") +
(if tex == null then "" else "${tex}/bin:") +
+ (if git == null then "" else "${git}/bin:") +
+ (if python3 == null then "" else "${python3}/bin:") +
"${xmodmap}/bin:${which}/bin";
inherit (common) postPatch;