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
This commit is contained in:
parent
5b7e3718ee
commit
b69542ae15
|
@ -1,7 +1,13 @@
|
||||||
{ stdenv, callPackage,
|
{ stdenv, callPackage,
|
||||||
fetchurl, guile_1_8, qt4, xmodmap, which, makeWrapper, freetype,
|
fetchurl, guile_1_8, qt4, xmodmap, which, makeWrapper, freetype,
|
||||||
|
libjpeg,
|
||||||
|
sqlite,
|
||||||
tex ? null,
|
tex ? null,
|
||||||
aspell ? null,
|
aspell ? null,
|
||||||
|
git ? null,
|
||||||
|
python3 ? null,
|
||||||
|
cmake,
|
||||||
|
pkgconfig,
|
||||||
ghostscriptX ? null,
|
ghostscriptX ? null,
|
||||||
extraFonts ? false,
|
extraFonts ? false,
|
||||||
chineseFonts ? false,
|
chineseFonts ? false,
|
||||||
|
@ -10,7 +16,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "TeXmacs";
|
pname = "TeXmacs";
|
||||||
version = "1.99.2";
|
version = "1.99.10";
|
||||||
common = callPackage ./common.nix {
|
common = callPackage ./common.nix {
|
||||||
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
|
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
|
||||||
};
|
};
|
||||||
|
@ -19,17 +25,38 @@ stdenv.mkDerivation {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
|
url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
|
||||||
sha256 = "0l48g9746igiaxw657shm8g3xxk565vzsviajlrxqyljbh6py0fs";
|
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" ];
|
NIX_LDFLAGS = [ "-lz" ];
|
||||||
|
|
||||||
postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
|
postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
|
||||||
(if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
|
(if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
|
||||||
(if aspell == null then "" else "${aspell}/bin:") +
|
(if aspell == null then "" else "${aspell}/bin:") +
|
||||||
(if tex == null then "" else "${tex}/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";
|
"${xmodmap}/bin:${which}/bin";
|
||||||
|
|
||||||
inherit (common) postPatch;
|
inherit (common) postPatch;
|
||||||
|
|
Loading…
Reference in New Issue